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

Commit 93ccb391 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfix from Trond Myklebust:

- Fix a socket lock leak in net/sunrpc/xprt.c

* tag 'nfs-for-3.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Ensure we release the socket write lock if the rpc_task exits early
parents 52b820d9 87ed5003

net/sunrpc/sched.c

+1 −2
Original line number Diff line number Diff line
@@ -972,7 +972,6 @@ static void rpc_async_release(struct work_struct *work) 


static void rpc_release_resources_task(struct rpc_task *task)

{

	if (task->tk_rqstp)

	xprt_release(task);

	if (task->tk_msg.rpc_cred) {

		put_rpccred(task->tk_msg.rpc_cred);

net/sunrpc/xprt.c

+10 −2
Original line number Diff line number Diff line
@@ -1136,10 +1136,18 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt) 
void xprt_release(struct rpc_task *task)

{

	struct rpc_xprt	*xprt;

	struct rpc_rqst	*req;

	struct rpc_rqst	*req = task->tk_rqstp;



	if (!(req = task->tk_rqstp))

	if (req == NULL) {

		if (task->tk_client) {

			rcu_read_lock();

			xprt = rcu_dereference(task->tk_client->cl_xprt);

			if (xprt->snd_task == task)

				xprt_release_write(xprt, task);

			rcu_read_unlock();

		}

		return;

	}



	xprt = req->rq_xprt;

	if (task->tk_ops->rpc_count_stats != NULL)