Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad2368d6 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Avoid RCU dereferences in the transport bind and connect code 



Avoid an RCU dereference by removing task->tk_xprt

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 45bc0dce

net/sunrpc/clnt.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

net/sunrpc/xprt.c

+2 −2
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ out_abort: 
 */

void xprt_connect(struct rpc_task *task)

{

	struct rpc_xprt	*xprt = task->tk_xprt;

	struct rpc_xprt	*xprt = task->tk_rqstp->rq_xprt;



	dprintk("RPC: %5u xprt_connect xprt %p %s connected\n", task->tk_pid,

			xprt, (xprt_connected(xprt) ? "is" : "is not"));
@@ -730,7 +730,7 @@ void xprt_connect(struct rpc_task *task) 


static void xprt_connect_status(struct rpc_task *task)

{

	struct rpc_xprt	*xprt = task->tk_xprt;

	struct rpc_xprt	*xprt = task->tk_rqstp->rq_xprt;



	if (task->tk_status == 0) {

		xprt->stat.connect_count++;