aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2007-05-09 08:30:11 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-09 17:58:00 -0400
commitddce40df6e14dd474bbd9daa006dcc290dea6326 (patch)
tree29995b5d0ad7fcab114d388b4ab1675e32ba963e /net
parente4cc6ee2e40bdd57990577b7f851fa2ca48edf47 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/sched.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index b28a0b037f4..b011eb625e4 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);