From ddce40df6e14dd474bbd9daa006dcc290dea6326 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 9 May 2007 08:30:11 +0200 Subject: 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 Signed-off-by: Trond Myklebust --- net/sunrpc/sched.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'net/sunrpc') diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index b28a0b0..b011eb6 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); -- cgit v1.1