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

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

SUNRPC: Fix a backchannel deadlock 



xprt_alloc_bc_request() cannot call xprt_free_bc_request() without
deadlocking, since it already holds the xprt->bc_pa_lock.

Reported-by: default avatarChuck Lever <chuck.lever@oracle.com>
Fixes: 0d2a970d ("SUNRPC: Fix a backchannel race")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent faa4a54f

net/sunrpc/backchannel_rqst.c

+2 −2
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ static struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt, __be32 xid) 
		req = xprt_alloc_bc_req(xprt, GFP_ATOMIC);

		if (!req)

			goto not_found;

		/* Note: this 'free' request adds it to xprt->bc_pa_list */

		xprt_free_bc_request(req);

		list_add_tail(&req->rq_bc_pa_list, &xprt->bc_pa_list);

		xprt->bc_alloc_count++;

	}

	req = list_first_entry(&xprt->bc_pa_list, struct rpc_rqst,

				rq_bc_pa_list);