SUNRPC: Ensure we release the socket write lock if the rpc_task exits early
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 7 Jan 2013 19:30:46 +0000 (14:30 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 8 Jan 2013 19:30:43 +0000 (14:30 -0500)
commit87ed50036b866db2ec2ba16b2a7aec4a2b0b7c39
tree8bd92625c340176d92ab0b77c0617bffd20a97eb
parentd287b8750e47c1702dab0e37ac11012bb751ece0
SUNRPC: Ensure we release the socket write lock if the rpc_task exits early

If the rpc_task exits while holding the socket write lock before it has
allocated an rpc slot, then the usual mechanism for releasing the write
lock in xprt_release() is defeated.

The problem occurs if the call to xprt_lock_write() initially fails, so
that the rpc_task is put on the xprt->sending wait queue. If the task
exits after being assigned the lock by __xprt_lock_write_func, but
before it has retried the call to xprt_lock_and_alloc_slot(), then
it calls xprt_release() while holding the write lock, but will
immediately exit due to the test for task->tk_rqstp != NULL.

Reported-by: Chris Perl <chris.perl@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org [>= 3.1]
net/sunrpc/sched.c
net/sunrpc/xprt.c