---

yaml --- r: 346563 b: refs/heads/master c: b8a13d0 h: refs/heads/master i: 346561: ba461bc 346559: 23d1d70 v: v3
git-mirror · Nov 4, 2012 · 733c025 · 733c025
1 parent 2716e6f
commit 733c025
Show file tree

Hide file tree

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