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,URIBL_BLOCKED,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 00263C433E2 for ; Mon, 29 Jun 2020 18:55:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF7B120656 for ; Mon, 29 Jun 2020 18:55:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593456918; bh=0bQKSbV06uF3Fy86wdZrTACqP+ZgxQPNSlkVIp9y6To=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1LChc97eLL4pyft6dLk9HvQpE96LHjd7sG8c2AyU9tPctMJLrqnQxSIv7UKDJaf3K bQFZf/ttcMCap0/+piZ4rcV+HVm5diPtyH3gqEPxsPT2g7fTuyQLJVM64naievN9pZ OKKMdDtIVWkbfEASfL7P1OErbVz1PjsCUx/vPiMo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729984AbgF2SzR (ORCPT ); Mon, 29 Jun 2020 14:55:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:42446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729915AbgF2SzQ (ORCPT ); Mon, 29 Jun 2020 14:55:16 -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 DE0EB25576; Mon, 29 Jun 2020 15:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446141; bh=0bQKSbV06uF3Fy86wdZrTACqP+ZgxQPNSlkVIp9y6To=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdScB9VmfKJRGP+k1OBK8m2REXCCVxNVEWbAaoVErQXxoJXewRVZeBfvlu5fF0lue CgVbd/Gc4BaDIXlSiXRlfUpqcrfzaBNVecp5L3yO+CEyTgD8tp5U83Eamq0ONuO4+H lx72MjtHziRvzvVo7c1BLvuideeI3n9s5wzd9j+g= 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 4.4 129/135] sunrpc: fixed rollback in rpc_gssd_dummy_populate() Date: Mon, 29 Jun 2020 11:53:03 -0400 Message-Id: <20200629155309.2495516-130-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.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.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+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 9103dd15511cc..12dd5cc499c1e 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -1347,6 +1347,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