From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 9 May 2007 06:30:11 +0000 (+0200)
Subject: sunrpc: fix crash in rpc_malloc()
X-Git-Tag: v2.6.22-rc1~139^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddce40df6e14dd474bbd9daa006dcc290dea6326;p=linux-2.6

sunrpc: fix crash in rpc_malloc()


While the comment says:
 * To prevent rpciod from hanging, this allocator never sleeps,
 * returning NULL if the request cannot be serviced immediately.

The function does not actually check for NULL pointers being returned.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index b28a0b037f..b011eb625e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -767,6 +767,10 @@ void *rpc_malloc(struct rpc_task *task, size_t size)
 		buf = mempool_alloc(rpc_buffer_mempool, gfp);
 	else
 		buf = kmalloc(size, gfp);
+
+	if (!buf)
+		return NULL;
+
 	buf->len = size;
 	dprintk("RPC: %5u allocated buffer of size %zu at %p\n",
 			task->tk_pid, size, buf);