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 197EBC433E1 for ; Mon, 29 Jun 2020 19:26:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7E3C2065F for ; Mon, 29 Jun 2020 19:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593458807; bh=rLbaZMUAKQYB56Bo7i9S1VPwfxj7Poup/AXcT8jRPHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rmnt9szS9EPPa8UN0pNoFgIMYIeqg7bVqqraVht/I7m6GN0ZqIm1i6VhTvoeW5Npw R/jAvSoPH0lZSsVYYxPtYiYx/lgRBVU0+p6NmsTuGDqL1pN82unfLJzrNXTGd6lxMt FJymdmiJZxBwwGeGWxkasTspjdEKHDJaXBaJxIHo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730760AbgF2T0p (ORCPT ); Mon, 29 Jun 2020 15:26:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:37070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732678AbgF2TZo (ORCPT ); Mon, 29 Jun 2020 15:25:44 -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 E2C4225370; Mon, 29 Jun 2020 15:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445235; bh=rLbaZMUAKQYB56Bo7i9S1VPwfxj7Poup/AXcT8jRPHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQCMZ+bn+vL3UgQ+42wBZIVplzaa13iZsLGHWMBST/tcRSz0Vl16bzLV8wP9FisqX sT0wwaBzSc047iMB4Yg6zttWIBU1cKTffogKHQJITgZmVSwEkORsVPOsSLaAPJP+ms tBQrEz6WuDCVsqe+gGlrMrhc37pUlAoMFpdcmgfY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiyu Yang , Xin Tan , "J . Bruce Fields" , Sasha Levin Subject: [PATCH 4.9 020/191] nfsd: Fix svc_xprt refcnt leak when setup callback client failed Date: Mon, 29 Jun 2020 11:37:16 -0400 Message-Id: <20200629154007.2495120-21-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629154007.2495120-1-sashal@kernel.org> References: <20200629154007.2495120-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:39+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 8d842282111be..172f697864ab5 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1156,6 +1156,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