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=ham 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 72B85C433E0 for ; Mon, 29 Jun 2020 18:35:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5477722281 for ; Mon, 29 Jun 2020 18:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593455752; bh=K8+LwfUHm44DtcHH9wCOgg7GmT6oZ3W6ubALuIjbOXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RdPTfOjVsdDl07VBgIwaW92bznLHupRhCpClImYHHFAxwt5ryA51BwDi0MRIBXJT7 2v+yyAFtEjANTf6uDWWN4LFjYuQ8wb7mprcIb9j1r4dNq708yehcfjIWp4LoF345fM 2LZpjn0alVRRdNsqZHqI1LdTLlgl2JA/gfUILvk0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726209AbgF2Sfv (ORCPT ); Mon, 29 Jun 2020 14:35:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:56904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726776AbgF2Sfu (ORCPT ); Mon, 29 Jun 2020 14:35:50 -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 E54AF247E5; Mon, 29 Jun 2020 15:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444151; bh=K8+LwfUHm44DtcHH9wCOgg7GmT6oZ3W6ubALuIjbOXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wld+Rvmx9dt+X21AAiXZEcBydEDxxlvH50AFTu37m3vfchJ3m3TAzLy3OrZUQbLEV SScxTZjkKecoUA5cn1SsHf5jTu60800zGlXr1KMk10RtQpvBUcWmBPQYAF6V7xOFUt u9QF04LaU9zQgrKiKKSqycK8rQtfcPXpUYI4DL0k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vasily Averin , Jeff Layton , Anna Schumaker , Greg Kroah-Hartman Subject: [PATCH 5.7 257/265] sunrpc: fixed rollback in rpc_gssd_dummy_populate() Date: Mon, 29 Jun 2020 11:18:10 -0400 Message-Id: <20200629151818.2493727-258-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin commit b7ade38165ca0001c5a3bd5314a314abbbfbb1b7 upstream. __rpc_depopulate(gssd_dentry) was lost on error path cc: stable@vger.kernel.org Fixes: commit 4b9a445e3eeb ("sunrpc: create a new dummy pipe for gssd to hold open") Signed-off-by: Vasily Averin Reviewed-by: Jeff Layton Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/rpc_pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 39e14d5edaf13..e9d0953522f09 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -1317,6 +1317,7 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) q.len = strlen(gssd_dummy_clnt_dir[0].name); clnt_dentry = d_hash_and_lookup(gssd_dentry, &q); if (!clnt_dentry) { + __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); pipe_dentry = ERR_PTR(-ENOENT); goto out; } -- 2.25.1