Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp580634iog; Mon, 13 Jun 2022 08:31:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uC9gwWBeMYMScuWhvT9EP3pzn6EPO6zFQwvoE2rmNpz9bJVeY840yT+fd7ewBPBohYs5kV X-Received: by 2002:a17:902:e5ca:b0:167:4e08:a63a with SMTP id u10-20020a170902e5ca00b001674e08a63amr213112plf.69.1655134304974; Mon, 13 Jun 2022 08:31:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655134304; cv=none; d=google.com; s=arc-20160816; b=GSUYszVhDrApW38ZmwrAG5Z8En9VobLDhg+ObsXRxAP5zsMvJg5WCwNCTDzXeHEi6U G4Ru6NHkJJMFdG7ciVFrTdgmYPHppZlNc1Orm8EPF7SxGGwJVGju+fDaHjeU0ywvpjx6 +thR7b4wX5Ztl+7oqBivON86mUjjZLOEGCHvjGxQPsHBC3/4t38nhK0vo1NhSjzvsngC 6ZKcTD9RuhW8BLCzjX3H1ZwAUq5DnZabra/QpJ27DFhNsK3jXHB9C0rbeqn4qD1nIm+G +jnvqFHScAj1ajLpwD2NjCj4npFT3Ibw1uxkw2+9Qxeg/mTVD42CNs+RIQPuyzZa6MPa Dqiw== 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=DvIGbVlsjj2HNzK2fOFinac1bv7zJzH1OLTvMX7Nll4=; b=Mli74ayV8hd+3JigiXP6RKqfVtK2OKN2DSsuZbvKXfH3MYVb3NeQNj513Wtgpkjht6 pqoXiuNLoCCn5+61toEhahioGyEFz+sip3dEQcaOfiMZtHFN/0+haopoqZ6LWo+h/vLd bZlaJtC1pBHNBcyiVmQbfTBCLP+UIDqtGSG0pyfKymakdVaU59fFk5oFtV0Ictl/vyPm iEKspuwt07Ngn62HZjJ36Ym4DgsvQCG95AI6r/eHTakjiug7q+dsyXE2hIGFj//kwiGe d9ZNa/vFheWUlia5HK0PwkfYcrRWKB9C6dbDXlp6/hgheL9nbT+gvThOv3j6/swuBTu3 2e8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ErMS3D1+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t11-20020a17090340cb00b0015838c0eedbsi8960465pld.506.2022.06.13.08.31.31; Mon, 13 Jun 2022 08:31:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ErMS3D1+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S240891AbiFMNLV (ORCPT + 99 others); Mon, 13 Jun 2022 09:11:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358394AbiFMNAJ (ORCPT ); Mon, 13 Jun 2022 09:00:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D80635DE3; Mon, 13 Jun 2022 04:18:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BCA5C60B6B; Mon, 13 Jun 2022 11:18:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAB13C34114; Mon, 13 Jun 2022 11:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655119081; bh=tFd6vRnzTblSZJjJSTJSRhOuRJ6Nhzgy75wAP5XxB6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ErMS3D1+FZFo0YVs0TAqtJKWjRUe2AnO6qXIY5J62ewtT5+x8Tl681spyv3ySx7Qn KvLGAzGRoaVox1BDTrLiR7bSdzrYqfzQ3h1HSQvIPV9krKhrPnaJpAlfuL8eN4OTNH bgzUNDYBX0tazH4MuRK/bb8cJY1FV6pdHr9sJ71w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.15 133/247] netfilter: nf_tables: use kfree_rcu(ptr, rcu) to release hooks in clean_net path Date: Mon, 13 Jun 2022 12:10:35 +0200 Message-Id: <20220613094926.994030250@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094922.843438024@linuxfoundation.org> References: <20220613094922.843438024@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit ab5e5c062f67c5ae8cd07f0632ffa62dc0e7d169 ] Use kfree_rcu(ptr, rcu) variant instead as described by ae089831ff28 ("netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant"). Fixes: f9a43007d3f7 ("netfilter: nf_tables: double hook unregistration in netns path") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 79e8fc687fdd..5833fe17be43 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -7231,7 +7231,7 @@ static void __nft_unregister_flowtable_net_hooks(struct net *net, nf_unregister_net_hook(net, &hook->ops); if (release_netdev) { list_del(&hook->list); - kfree_rcu(hook); + kfree_rcu(hook, rcu); } } } -- 2.35.1