From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:39809 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932451AbcI2JG7 (ORCPT ); Thu, 29 Sep 2016 05:06:59 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: Trond Myklebust , Jiri Slaby Subject: [patch added to 3.12-stable] NFSv4.x: Fix a refcount leak in nfs_callback_up_net Date: Thu, 29 Sep 2016 11:06:14 +0200 Message-Id: <20160929090654.27405-3-jslaby@suse.cz> In-Reply-To: <20160929090654.27405-1-jslaby@suse.cz> References: <20160929090654.27405-1-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Trond Myklebust This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit 98b0f80c2396224bbbed81792b526e6c72ba9efa upstream. On error, the callers expect us to return without bumping nn->cb_users[]. Signed-off-by: Trond Myklebust Signed-off-by: Jiri Slaby --- fs/nfs/callback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 50443e6dc033..9c98225e45cd 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -302,6 +302,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; -- 2.10.0