Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp517480pxb; Thu, 9 Sep 2021 06:17:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhH57wiVKKzMCz/130q7w/CgT/WK0p87BD0bzggR95W65jubLE4fs6P0byZjAfVHd3WOF/ X-Received: by 2002:a05:6602:2001:: with SMTP id y1mr2663986iod.97.1631193436895; Thu, 09 Sep 2021 06:17:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631193436; cv=none; d=google.com; s=arc-20160816; b=IuYvEdBBaUd3NHMFi2G7zX1R8h3ywgP9q7T/if7amayr6D76xFlRydTB56Hdx8pjRn lvSAfuFoR1/fWSgx7YjIEVJ3ibhmAwdW5Pra7bCuPSBYAtVxrTL55LSA0f+RWOesZPGy wnDqe432dHSCZCeJ9lGQINCT/Tv/ldeSr2410YoVUj0KaHkmKMXphGIdkSnnVHHZQjA4 dq9d1NhiHaeK5EaUjs3T0qyxzrKkI2B2xmnv0wfX/NwXjjoA8ub/aP2SZdG9pBj8rqXi paD6yTc/n6LsVgNbQmRKgpjU4iP4evFebH1IWWw7gLwlPMb+sR239AuIoR3nRwAvNX6b KPnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sqFtjrdLbid+9jwH1H9ufO+IaGrFMqeUbEkN2TdYcXM=; b=CVkbLeDfLxEE5aWF4zvQRecVkFeOWn4atwAwRpxzxO+czT67znRcn9suzdFnP2ycuc O+hnmbWORr1gvIgRSi8HLHCnFddfUD2Pdsvgb3yQoFdUWBvjqACC4RBJqF0Og8TowIfI DL10joOWj2czdKfxKBej0jTSGXXShf1cqIk3Ut+DgvIew2fuTuIZzR0MUEYc0V/WD+V6 fBeIyTQfTVGwyuBZlBcAcFtI+cEjoOA2SBJ4Hkoa1nW7JbJ0l8CusTRfI2svY7lRxLYs uMgPBL3TL2TanWhnvk1P6rXZvqcA0KSQmXvU+n1hyqr4oXdKTOz7+HQsyhPIwtN04B+/ oqVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uQToCvwT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r19si1604657ioa.68.2021.09.09.06.17.00; Thu, 09 Sep 2021 06:17:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uQToCvwT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358699AbhIINPu (ORCPT + 99 others); Thu, 9 Sep 2021 09:15:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:46260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357663AbhIINDP (ORCPT ); Thu, 9 Sep 2021 09:03:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 418C263281; Thu, 9 Sep 2021 11:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188790; bh=OTeBBEk+/aMmAs7ageVFeEy3xXpZOhG0XdHKbdu/UtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uQToCvwT6gKsqgzEwik+CHwmZQzvcb+qrLcIxxkwA0OgQnWsODLYLIsL0ZA3HXxwT sdTPrTNgWPqzohMSRSCb4ecryEFUdaFthxOQkX6S5goqM6asNX99tc93FrBo7wdNxf dzGwZrXIMlY63Ewhe6btN53ZEVnqFTo8RK02ZkZ93fDi83GuEOi2DrZIp1ALHQUxD0 ZotmefDg0t8QlUYYmwZtVuuG05XUlVZL+U5LA4tcDuHvzDfH4lLV6g4W5FuYo8ck5S CiSjWtUExmiPZ9tC1iTXtcrCpat0eA7jPcMOFaWbeYQ4H2p6Ddyf6xYietABvecoeE Bo+2R81ZEiKaw== 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 4.14 39/59] rpc: fix gss_svc_init cleanup on failure Date: Thu, 9 Sep 2021 07:58:40 -0400 Message-Id: <20210909115900.149795-39-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115900.149795-1-sashal@kernel.org> References: <20210909115900.149795-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-kernel@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 27dfd85830d8..4f41a1bc59bf 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1861,7 +1861,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