Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2319845pxb; Mon, 20 Sep 2021 18:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHuT7YOjhWBeD/haveimw6CGIRdn6z4aGsTi56Kkr3UNuzhr+SV/Bmd1/pHiCKRujb2ACL X-Received: by 2002:a05:6638:14b:: with SMTP id y11mr15336117jao.34.1632188597580; Mon, 20 Sep 2021 18:43:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632188597; cv=none; d=google.com; s=arc-20160816; b=A7BWlj2ypwkkAo2IL/ba0+l8TCW8WG06kosRR//BGJ8xXiDY3lPx4S21Aoq6jTxgDT 8Jl8F47qVr2EFPf9+n3XAC43uCb41qA6mNoHqBbPcL9rc4kv0Cpdp3OClmv730g3KB3M 1k9lrmjeKT1ZdOuraye38qnNBqVTuNHhSvP8+ERAKdy/WLeJf1Z/MhQraq4EaFf0rpvw +zJml6P1N4IYzq1wMNILMJ50Y689catP5+p926AvLzzPajPPjOPKqB4e+m3DYGoGyqoj zTx5YEVDKSXfYsrl2LnoQZOPHeJEPVU5j7MAWyQHJ58tfR9GShKkMWn9q7CZErUKpAoV T/uA== 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=MCaO8G22ED5PDiPal8wYqHBqCxEDi/t3qhtfsX8oPqw=; b=XUmgG7ymYU8Ha9mdl3GdaV8R4i32cO1/SQoN+vPlgKtcaP177K8icXTtIFd1/5ddcc ulAgm+/lUOjRi1okqw5zAXz8FLO3YpocdHcvSPh2wcCgLnd7mst6YDG9lHRJBCf9LwXH o30rZZPZUTOb422NiGoAz37B+gLazp1vgnwQMKF9dPfZR2lkfUIYaGNrrObxdYOs21ky yEdRQzGVnYEb0oSA0BOpj4Az7vOT2SD27k66O3JvIbnczv3Nctw+t4+HdvvLIZb+fssT +CPfGRCuu1WqFNR5U5uCsvyJyXIU8rGWYOIBBYxNnrsGg4BD4dS1F9phko3Txg37hdx2 biiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ncF+UGwv; 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 t13si15552890jam.123.2021.09.20.18.43.06; Mon, 20 Sep 2021 18:43:17 -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=ncF+UGwv; 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 S245048AbhITQyP (ORCPT + 99 others); Mon, 20 Sep 2021 12:54:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:38784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237332AbhITQun (ORCPT ); Mon, 20 Sep 2021 12:50:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1E0CB61351; Mon, 20 Sep 2021 16:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632156543; bh=IBIVmOL369LFjKG+XM3g14fm6SBagN/h5YPqfsTxOQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ncF+UGwvIuasqfIzXWpomcSFi7uNP6TTtLS32fwwcazdoVmjaJSVXrIzH9a/Innje mCa1cq3YsJA9tpbVYvIkUkMtJ57JA2q6QoHjZfuR53K79qj748NGkuz1l7XQoQ7lQk pF9kQa7zL91+JVmK/Y2bEXTsc7K36Yvit8Wxi56M= 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 4.4 108/133] rpc: fix gss_svc_init cleanup on failure Date: Mon, 20 Sep 2021 18:43:06 +0200 Message-Id: <20210920163916.157962735@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163912.603434365@linuxfoundation.org> References: <20210920163912.603434365@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 bb8b0ef5de82..daf0c1ea3917 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1845,7 +1845,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