Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E3043DCDA6 for ; Wed, 15 Apr 2026 15:28:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.190.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776266932; cv=none; b=oaJKSsjbnYj3sTgkACSBMaLrkDt+JWL09bKGrOVe7oQbsEmHGQy7cptIF3u+1NmqGhsu7j5ChtoS6VCeIF2EFpvCmQ5QC8I/p8lJ6N3VBgu8jIBP3xY6OXmq7G/CroBG+U84zSYqhtlgaowo9veTQHbiw3HxN1xqc7gCumV0PEg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776266932; c=relaxed/simple; bh=2PnNyV/gLPpTMUgXv7rwe9Kc35L/cyjQQ3Q/r9li7OY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=PpLTI7zJwq/ssGlU8ELt5hHS+EIDSUe+kTPOkeq//LQgaD1nTx1HsiEHdGLrTjXqFBhXdalCHLEs3tM1xnEittDMj8GYiCS9MpntYXIsIICJVF33gdsJQcCyOgwHKCU+P8ybtuoNuKQiy2tguBEfeWp1dl+RHao800DOeKsyGQ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=Oou6wDFv; arc=none smtp.client-ip=217.70.190.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="Oou6wDFv" Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id D241560177 for ; Wed, 15 Apr 2026 17:28:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1776266927; bh=CaQ4O1NqtW+OBqa3JpCx9fm4C3+hTiR5VyrOh0qJfHk=; h=From:To:Subject:Date:From; b=Oou6wDFvmy7qls8Xogoyp4IPG11mc1bGAFEBIIf6hMUEjZy6tAHajRU7ZNelK3fBJ wpa3c0N7AG+yM9TsIuDhFMPyv3kVAc4DpRFDQXcNYLtFHdb2PGVjkgeD6n30OyLduh EfqTH+G+DMH0ZQFkRZAS2Wt7VcrwIdlE/xtPrITfsHRtyYySOOh/OD33QjCO+rflUX X/N65SnKXHiJwJetxEDo5U0NWpC+G3tCt6ZC86G+xJ1jM31HOieYCKh2mgbR4TcVcc CjQZxUHF9uSqLcuDKVPa812sCZUWvzgiG8NaxScmiUj+HzYscJzIi97w8zuhQX5qJc k8HH9G2HfATyw== From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nf,v2] netfilter: nat: use kfree_rcu to release ops Date: Wed, 15 Apr 2026 17:28:43 +0200 Message-ID: <20260415152843.1770-1-pablo@netfilter.org> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Florian Westphal says: "Historically this is not an issue, even for normal base hooks: the data path doesn't use the original nf_hook_ops that are used to register the callbacks. However, in v5.14 I added the ability to dump the active netfilter hooks from userspace. This code will peek back into the nf_hook_ops that are available at the tail of the pointer-array blob used by the datapath. The nat hooks are special, because they are called indirectly from the central nat dispatcher hook. They are currently invisible to the nfnl hook dump subsystem though. But once that changes the nat ops structures have to be deferred too." Update nf_nat_register_fn() to deal with partial exposition of the hooks from error path which can be also an issue for nfnetlink_hook. Fixes: e2cf17d3774c ("netfilter: add new hook nfnl subsystem") Signed-off-by: Pablo Neira Ayuso --- v2: fix incorrect prefix for patch subject. net/ipv4/netfilter/iptable_nat.c | 2 +- net/ipv6/netfilter/ip6table_nat.c | 2 +- net/netfilter/nf_nat_core.c | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/ipv4/netfilter/iptable_nat.c b/net/ipv4/netfilter/iptable_nat.c index a5db7c67d61b..3b1de7f82bf8 100644 --- a/net/ipv4/netfilter/iptable_nat.c +++ b/net/ipv4/netfilter/iptable_nat.c @@ -100,7 +100,7 @@ static void ipt_nat_unregister_lookups(struct net *net) for (i = 0; i < ARRAY_SIZE(nf_nat_ipv4_ops); i++) nf_nat_ipv4_unregister_fn(net, &ops[i]); - kfree(ops); + kfree_rcu(ops, rcu); } static int iptable_nat_table_init(struct net *net) diff --git a/net/ipv6/netfilter/ip6table_nat.c b/net/ipv6/netfilter/ip6table_nat.c index e119d4f090cc..9adfbfeaab0c 100644 --- a/net/ipv6/netfilter/ip6table_nat.c +++ b/net/ipv6/netfilter/ip6table_nat.c @@ -102,7 +102,7 @@ static void ip6t_nat_unregister_lookups(struct net *net) for (i = 0; i < ARRAY_SIZE(nf_nat_ipv6_ops); i++) nf_nat_ipv6_unregister_fn(net, &ops[i]); - kfree(ops); + kfree_rcu(ops, rcu); } static int ip6table_nat_table_init(struct net *net) diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 3b5434e4ec9c..b30ca94c2bb7 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -1228,9 +1228,11 @@ int nf_nat_register_fn(struct net *net, u8 pf, const struct nf_hook_ops *ops, ret = nf_register_net_hooks(net, nat_ops, ops_count); if (ret < 0) { mutex_unlock(&nf_nat_proto_mutex); - for (i = 0; i < ops_count; i++) - kfree(nat_ops[i].priv); - kfree(nat_ops); + for (i = 0; i < ops_count; i++) { + priv = nat_ops[i].priv; + kfree_rcu(priv, rcu_head); + } + kfree_rcu(nat_ops, rcu); return ret; } @@ -1294,7 +1296,7 @@ void nf_nat_unregister_fn(struct net *net, u8 pf, const struct nf_hook_ops *ops, } nat_proto_net->nat_hook_ops = NULL; - kfree(nat_ops); + kfree_rcu(nat_ops, rcu); } unlock: mutex_unlock(&nf_nat_proto_mutex); -- 2.47.3