From: Weston Andros Adamson <dros@netapp.com>
Date: Tue, 23 Oct 2012 14:43:42 +0000 (-0400)
Subject: SUNRPC: remove BUG_ON in xdr_shrink_bufhead
X-Git-Tag: firefly_0821_release~3680^2~1413^2~71
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=18e624ad0374f3b1092530f978301611f88e45b3;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 08f50afd5f2a..56055632f151 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) {