Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2331439pxb; Mon, 20 Sep 2021 19:07:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyir75xH/n5UlNGxXjR8i0xUMuy2uI8C7LRrbBXuli6Rk21Q8RhzHFH+NNSn3sRQL1ym4X X-Received: by 2002:a17:906:c246:: with SMTP id bl6mr31772983ejb.80.1632190027201; Mon, 20 Sep 2021 19:07:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632190027; cv=none; d=google.com; s=arc-20160816; b=n8WUKCL0E0RpDZDy7KPnNni7GTg9PHsBH5OTMdNFx08GPOD3j10j5N9V4KtLCbMGeg mqZHsPs5QiWdUJWOvSU+JHjdCzx+xzd6tIIMPizceMra+WgYro+DMAMnL/EkDwMq5GE0 vQA6XEVLAL9GrE66wyzlN5eRTT2wSFlM6kOZB8rTaACrZum4xJw6C4NaJir9uVp6h1sL 5FLyPKw50P1H8JTU9OuBvDA/8zBz5pusS2ABUhM7SvVIrQHAV1lhoQNuTc9iVomzrA/n xyXR0Saww/I16ULT38MXyII5MwTSC4KnACWzkd6cfSPvtPNwNSPtZyxYBig9c6zX0ypD OBVw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6PBi8E//3anKIzAEMRroFi7+G7HJNDKWA66ibW2jgdU=; b=CMhl9w9qTJ37+bAwZ1i4yKlMPhxdgDGudxdKMaFvcLUDLFf0jX8jOlC4wCR2rUsiTh 6D7aRa9b/Je56ujz1ttOm7WapPwXxwcWNP+m2ec4rYZPYJEowsGAWhrOHFlz8rI4LN2r F2WP4+xVydJZxVl5j0y6RO9B+L+odlsCTYaoB4DrOIjHVvVByzBqIfRXGzXyj08GUf4x 3MxsECfr0ON4QnvUqImtIGML9+mA6/vbTAbLYb8fr4Espw5dc8QW3XUZA4sUXkkeDxJT ZW7BL1sLgfVtLrZu9ue2MVaS+G6hNNp88wzPh3HRqXK/8Hadti21/EI1d28oc/JxhXDu nyaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yaLURNKy; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p24si18652059edr.355.2021.09.20.19.06.39; Mon, 20 Sep 2021 19:07:07 -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=@linuxfoundation.org header.s=korg header.b=yaLURNKy; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343964AbhITSPg (ORCPT + 99 others); Mon, 20 Sep 2021 14:15:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359799AbhITSKT (ORCPT ); Mon, 20 Sep 2021 14:10:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 927EB63270; Mon, 20 Sep 2021 17:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632158406; bh=1eVM9060H543AHeb/3mDnABC/6PfU2rVPqL0/npPluQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yaLURNKy7VIUoWpX9ciVdLlQkoNaEmueLqKqnzqW4ytUAvzb4XsbcwFhrSun4LkwK PoGco1rNVYaIqbaEa7S1uRXenJcPl8mjXqmJhTIED/nEuDcdgrb4KpMAUjo+tQNmk1 A4s+coPcPNGeqpdk36eIPGU7SWbCj3VnCWWYeX5w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "J. Bruce Fields" , Chuck Lever , Sasha Levin Subject: [PATCH 5.4 141/260] rpc: fix gss_svc_init cleanup on failure Date: Mon, 20 Sep 2021 18:42:39 +0200 Message-Id: <20210920163935.905393301@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163931.123590023@linuxfoundation.org> References: <20210920163931.123590023@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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