diff options
| author | Weston Andros Adamson <dros@netapp.com> | 2012-10-23 10:43:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-04 14:43:42 -0500 |
| commit | 18e624ad0374f3b1092530f978301611f88e45b3 (patch) | |
| tree | 16f0c87a18a598289acfa5c59ab7e3b8c4308759 /net | |
| parent | b25cd058f25ea2054351bbe501956002cd8ed4c5 (diff) | |
| download | op-kernel-dev-18e624ad0374f3b1092530f978301611f88e45b3.zip op-kernel-dev-18e624ad0374f3b1092530f978301611f88e45b3.tar.gz | |
SUNRPC: remove BUG_ON in xdr_shrink_bufhead
Replace bounds checking BUG_ON() with a WARN_ON_ONCE() and resetting
the requested len to the max.
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xdr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 08f50af..5605563 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -318,7 +318,10 @@ xdr_shrink_bufhead(struct xdr_buf *buf, size_t len) tail = buf->tail; head = buf->head; - BUG_ON (len > head->iov_len); + + WARN_ON_ONCE(len > head->iov_len); + if (len > head->iov_len) + len = head->iov_len; /* Shift the tail first */ if (tail->iov_len != 0) { |
