From 2716e6f70e5db029deac1a28818017588df0ec9d Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Tue, 23 Oct 2012 10:43:42 -0400
Subject: [PATCH] --- yaml --- r: 346562 b: refs/heads/master c:
 18e624ad0374f3b1092530f978301611f88e45b3 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/sunrpc/xdr.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 30b038e6252e..aa651f9d6eb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b25cd058f25ea2054351bbe501956002cd8ed4c5
+refs/heads/master: 18e624ad0374f3b1092530f978301611f88e45b3
diff --git a/trunk/net/sunrpc/xdr.c b/trunk/net/sunrpc/xdr.c
index 08f50afd5f2a..56055632f151 100644
--- a/trunk/net/sunrpc/xdr.c
+++ b/trunk/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) {