summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/clnt.c
diff options
context:
space:
mode:
authorTrond Myklebust2013-01-08 16:08:33 +0100
committerTrond Myklebust2013-02-01 16:13:47 +0100
commitad2368d6f5ec6467b9503176e9fb878daf999629 (patch)
tree0688b822d1b969a9b0771a7b10e4a9420f9cf418 /net/sunrpc/clnt.c
parentSUNRPC: Fix an RCU dereference in xprt_reserve (diff)
downloadkernel-qcow2-linux-ad2368d6f5ec6467b9503176e9fb878daf999629.tar.gz
kernel-qcow2-linux-ad2368d6f5ec6467b9503176e9fb878daf999629.tar.xz
kernel-qcow2-linux-ad2368d6f5ec6467b9503176e9fb878daf999629.zip
SUNRPC: Avoid RCU dereferences in the transport bind and connect code
Avoid an RCU dereference by removing task->tk_xprt Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r--net/sunrpc/clnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 6b3411ba23f1..a9f7906c1a6a 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1508,7 +1508,7 @@ rpc_xdr_encode(struct rpc_task *task)
static void
call_bind(struct rpc_task *task)
{
- struct rpc_xprt *xprt = task->tk_xprt;
+ struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;
dprint_status(task);
@@ -1602,7 +1602,7 @@ retry_timeout:
static void
call_connect(struct rpc_task *task)
{
- struct rpc_xprt *xprt = task->tk_xprt;
+ struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;
dprintk("RPC: %5u call_connect xprt %p %s connected\n",
task->tk_pid, xprt,