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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 36F24C433EF for ; Thu, 9 Sep 2021 12:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 209AB60555 for ; Thu, 9 Sep 2021 12:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354427AbhIIM5x (ORCPT ); Thu, 9 Sep 2021 08:57:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:40918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353357AbhIIMtJ (ORCPT ); Thu, 9 Sep 2021 08:49:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C4E463211; Thu, 9 Sep 2021 11:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188602; bh=/Mc2ln3JnejyRuR3H4GwKJgFRcdTutqOBtrVfUGEjlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iTaMZ7O2nuZ9F5/X9SzpyUZCl7ZFvL0w9tNnelP3Tqv+/zFQDTy7cuzBKEe0/tu/D rz92xdw7qXt4ATc25tiLFUksTIrs4iLUG6IvnHyjpNt6VA/MxJBOIekSVZkHExodVy yc4XBVAlVgYZHIhrN57KlkxiMlT69ZGPcLSxOsJQ8NsEIwd8bu+LQy78VYMHnk+a7+ 092sAdLkQGAv9MaU4XTqC41wIo9fAkB+N3qgBWAe976rcOJUdI/LK0Mrzov2+PnSYp /UV2JdsOjxK+lpmW0lvt631jT7oFSe7d849AmB6ny173LXY1YLwwJCZ9CIYxOpnYM0 mXlWaCN1Yy3vA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "J. Bruce Fields" , Chuck Lever , Sasha Levin , linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 074/109] rpc: fix gss_svc_init cleanup on failure Date: Thu, 9 Sep 2021 07:54:31 -0400 Message-Id: <20210909115507.147917-74-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115507.147917-1-sashal@kernel.org> References: <20210909115507.147917-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" [ Upstream commit 5a4753446253a427c0ff1e433b9c4933e5af207c ] The failure case here should be rare, but it's obviously wrong. Signed-off-by: J. Bruce Fields Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index d5470c7fe879..c0016473a255 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1937,7 +1937,7 @@ gss_svc_init_net(struct net *net) goto out2; return 0; out2: - destroy_use_gss_proxy_proc_entry(net); + rsi_cache_destroy_net(net); out1: rsc_cache_destroy_net(net); return rv; -- 2.30.2