From 733c0256855126a2f2ae77db5855c44afe07b45c Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Tue, 23 Oct 2012 10:43:43 -0400
Subject: [PATCH] --- yaml --- r: 346563 b: refs/heads/master c:
 b8a13d039cbf7aec3b486fc0ae3996a5449afed2 h: refs/heads/master i:   346561:
 ba461bcb0f8a0d26005fc7831f539dbec574056d   346559:
 23d1d708ac770158eedc555f92dba9d8c047cc39 v: v3

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

diff --git a/[refs] b/[refs]
index aa651f9d6eb7..715e6050288e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18e624ad0374f3b1092530f978301611f88e45b3
+refs/heads/master: b8a13d039cbf7aec3b486fc0ae3996a5449afed2
diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c
index 46c1a8798ed8..6db26e5538fb 100644
--- a/trunk/net/sunrpc/xprtsock.c
+++ b/trunk/net/sunrpc/xprtsock.c
@@ -2330,9 +2330,11 @@ static void *bc_malloc(struct rpc_task *task, size_t size)
 	struct page *page;
 	struct rpc_buffer *buf;
 
-	BUG_ON(size > PAGE_SIZE - sizeof(struct rpc_buffer));
-	page = alloc_page(GFP_KERNEL);
+	WARN_ON_ONCE(size > PAGE_SIZE - sizeof(struct rpc_buffer));
+	if (size > PAGE_SIZE - sizeof(struct rpc_buffer))
+		return NULL;
 
+	page = alloc_page(GFP_KERNEL);
 	if (!page)
 		return NULL;