From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Mon, 29 Aug 2016 15:15:36 +0000 (-0400)
Subject: NFSv4.x: Fix a refcount leak in nfs_callback_up_net
X-Git-Tag: v3.16.39~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c512940b28f7e2a88fa2a33ce3343d9c3c798ade;p=thirdparty%2Fkernel%2Fstable.git

NFSv4.x: Fix a refcount leak in nfs_callback_up_net

commit 98b0f80c2396224bbbed81792b526e6c72ba9efa upstream.

On error, the callers expect us to return without bumping
nn->cb_users[].

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 8c849947d34f5..c1f955e2d8092 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -301,6 +301,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n
 err_socks:
 	svc_rpcb_cleanup(serv, net);
 err_bind:
+	nn->cb_users[minorversion]--;
 	dprintk("NFS: Couldn't create callback socket: err = %d; "
 			"net = %p\n", ret, net);
 	return ret;