---

yaml --- r: 346562 b: refs/heads/master c: 18e624a h: refs/heads/master v: v3
git-mirror · Nov 4, 2012 · 2716e6f · 2716e6f
1 parent ba461bc
commit 2716e6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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) {