Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1733302pxb; Thu, 16 Sep 2021 14:16:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIvI0KNqoDUJMAvydW3KtTUWO88K3mnKDiBht1Ox9CBD2bR9rPwxyJ9eEXcjPmDg10i8q0 X-Received: by 2002:a05:6e02:154a:: with SMTP id j10mr5574636ilu.79.1631826997861; Thu, 16 Sep 2021 14:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631826997; cv=none; d=google.com; s=arc-20160816; b=Spd6E5V1fnpsT2OXvRsCB/334GDriLYIkDjjrMJZE+GfyflvQuaZx4peglRVR6l2gw 6QiJgKrpQ2iFRZGHwji1RjqgiaV6p6ayhY6T78d8SrH2La6gJXxRDW7O09W3cgG46eyP rXlnk1DpYkXRQfY2Fds1gHlfVKTNSoFtfk6jkZ4ccOF89mRWE0byqyjKF1ZqrKSTYY4c GecxZCYbX1BQG9iI1I4x4Yl9Mxjdjs5mfrTH/9PNEcvzxvEV2bhNFs7SoJYH9qQAiquh yMA/JbU9EF/HcY3Opv6Y0VXTJhPc4dHT0yeadFNxNSjc8SDr+td9QbwmdjYwBR+zVlMM rLbQ== 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=1haNIml6KMT/qD2TqrLbLA88bZLsu1yOW2NJaBx5eRk=; b=IK93KJrytKxut7aLC2zw3G00ykpCAVd2O9Qs8+XBRhE4BBTp9piVvp41Ld0yAiBUW+ OYwGWn35AEeAGK5Z67c4OiFyZ1Hf+KtoVW2Jbj1AADdOtY0g8wBxtpmHfqsglmelzOi5 7ovrhhIhow0De9r+9ZRxvpzzLG4SF5kk+lMn4YOjG/0neq0ym5qe7JQMh0U/cvWLQcc/ 43XddSVuAkf6PEvhYh91QtSFtFEm+tHDQfzUTK91D2iactyYLfq4L7g/nltlSoDiMBCs SLWPaue5KvRiT8ivJ1hLJXpuE5uORwJ4chpdl47f5zK00HCA8gWlu/dczocr4iD3siPf MJbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Ok/Aue14"; 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 k17si4583858jav.64.2021.09.16.14.16.17; Thu, 16 Sep 2021 14:16:37 -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="Ok/Aue14"; 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 S234769AbhIPQ1c (ORCPT + 99 others); Thu, 16 Sep 2021 12:27:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:55040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241126AbhIPQTR (ORCPT ); Thu, 16 Sep 2021 12:19:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE9B36137F; Thu, 16 Sep 2021 16:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808793; bh=rzXuxzwfo0rUa+MXxZD9zmqtGv25AxQYRDc7PVfMWU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ok/Aue14c260eiuC+3vkqba62gAJbVtso7Xnpe6PhlG5wDdBstXir32OpOif3nOrg yA/C4XcY1RK/9jxeX4ebZMYm8KsdMXMj9WU11nH4V1qWzdW/E00uBgpQ7nGmdR9mHd lzG4WhH+mqB1udICnPn95Bmxz+RoGi8GPdTRhUdk= 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.10 225/306] rpc: fix gss_svc_init cleanup on failure Date: Thu, 16 Sep 2021 17:59:30 +0200 Message-Id: <20210916155801.717814739@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@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 6dff64374bfe..e22f2d65457d 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1980,7 +1980,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