From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 723AFC433E0 for ; Thu, 18 Jun 2020 02:04:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4417A221F8 for ; Thu, 18 Jun 2020 02:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592445856; bh=td8suLRvJnyRZM3OwwtUUrBil9gsPxaa2qMExIOQczI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aWJm2jyL9P+OTB1QHJMSRlkUADjUXYbcBWhn0eq3m7aeHGyHU9u8HDNaRyOcracik oGqlOP5+ZfjNMtftHp7eVADufS6Po+i19Dx5e3yci9dnerTEafXVD/84Af0tjvJiqV C7MQ/5tYEDHgeFmwqffsc5oc9aAZEcniu34MqCz8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730924AbgFRBXJ (ORCPT ); Wed, 17 Jun 2020 21:23:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:56442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730917AbgFRBXG (ORCPT ); Wed, 17 Jun 2020 21:23:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 883CB20663; Thu, 18 Jun 2020 01:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443386; bh=td8suLRvJnyRZM3OwwtUUrBil9gsPxaa2qMExIOQczI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NOp7G5VwTInfC5FxGnJ4bmFjp47xkvHLsT1/HxhHVlhoUkgD5ckd8/+kPWJklX3b7 0FO/JQxAi3VHXPjM+8kuzgJrDfP+B/HDEa3nxUDMjHNiOv6Jojbee+tM+HXExDgpWn 1JOArgFmTmS8f7zLT8tjIE73WKQLBSwdp/TiUtZw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiyu Yang , Xin Tan , "J . Bruce Fields" , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 036/172] nfsd: Fix svc_xprt refcnt leak when setup callback client failed Date: Wed, 17 Jun 2020 21:20:02 -0400 Message-Id: <20200618012218.607130-36-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Xiyu Yang [ Upstream commit a4abc6b12eb1f7a533c2e7484cfa555454ff0977 ] nfsd4_process_cb_update() invokes svc_xprt_get(), which increases the refcount of the "c->cn_xprt". The reference counting issue happens in one exception handling path of nfsd4_process_cb_update(). When setup callback client failed, the function forgets to decrease the refcnt increased by svc_xprt_get(), causing a refcnt leak. Fix this issue by calling svc_xprt_put() when setup callback client failed. Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfs4callback.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index ebbb0285addb..7ee417b685e9 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1149,6 +1149,8 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) err = setup_callback_client(clp, &conn, ses); if (err) { nfsd4_mark_cb_down(clp, err); + if (c) + svc_xprt_put(c->cn_xprt); return; } } -- 2.25.1