From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50709 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932129AbcGLCCO (ORCPT ); Mon, 11 Jul 2016 22:02:14 -0400 Subject: Patch "SUNRPC: fix xprt leak on xps allocation failure" has been added to the 4.6-stable tree To: bfields@redhat.com, gregkh@linuxfoundation.org, trondmy@primarydata.com Cc: , From: Date: Mon, 11 Jul 2016 16:39:11 -0700 Message-ID: <146828035114220@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled SUNRPC: fix xprt leak on xps allocation failure to the 4.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sunrpc-fix-xprt-leak-on-xps-allocation-failure.patch and it can be found in the queue-4.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 1208fd569c07ab84aa5d024abd863267c2953b4a Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 20 May 2016 17:07:17 -0400 Subject: SUNRPC: fix xprt leak on xps allocation failure From: J. Bruce Fields commit 1208fd569c07ab84aa5d024abd863267c2953b4a upstream. Callers of rpc_create_xprt expect it to put the xprt on success and failure. Signed-off-by: J. Bruce Fields Acked-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/clnt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -453,9 +453,10 @@ static struct rpc_clnt *rpc_create_xprt( struct rpc_xprt_switch *xps; xps = xprt_switch_alloc(xprt, GFP_KERNEL); - if (xps == NULL) + if (xps == NULL) { + xprt_put(xprt); return ERR_PTR(-ENOMEM); - + } clnt = rpc_new_client(args, xps, xprt, NULL); if (IS_ERR(clnt)) return clnt; Patches currently in stable-queue which might be from bfields@redhat.com are queue-4.6/nfsd-check-permissions-when-setting-acls.patch queue-4.6/nfsd-always-lock-state-exclusively.patch queue-4.6/rpc-share-one-xps-between-all-backchannels.patch queue-4.6/nfsd-extend-the-mutex-holding-region-around-in-nfsd4_process_open2.patch queue-4.6/nfsd4-rpc-move-backchannel-create-logic-into-rpc-code.patch queue-4.6/sunrpc-fix-xprt-leak-on-xps-allocation-failure.patch