{"id":2233362,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2233362/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260506100728.2664-9-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.1/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260506100728.2664-9-fw@strlen.de>","date":"2026-05-06T10:07:20","name":"[v3,nf,8/8] netfilter: x_tables: close dangling table module init race","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a0a89d75fb7860b6112558a1b7b15f020eddcb93","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.1/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260506100728.2664-9-fw@strlen.de/mbox/","series":[{"id":502948,"url":"http://patchwork.ozlabs.org/api/1.1/series/502948/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=502948","date":"2026-05-06T10:07:14","name":"netfilter: xtables: fix module load and teardown races","version":3,"mbox":"http://patchwork.ozlabs.org/series/502948/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2233362/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233362/checks/","tags":{},"headers":{"Return-Path":"\n <netfilter-devel+bounces-12459-incoming=patchwork.ozlabs.org@vger.kernel.org>","X-Original-To":["incoming@patchwork.ozlabs.org","netfilter-devel@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-12459-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=91.216.245.30","smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=strlen.de","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g9WKw5MgXz1yJx\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 06 May 2026 20:08:20 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 206BB300952B\n\tfor <incoming@patchwork.ozlabs.org>; Wed,  6 May 2026 10:08:17 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id CEAC03FBECA;\n\tWed,  6 May 2026 10:08:16 +0000 (UTC)","from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc\n [91.216.245.30])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id C9CA935F5E4\n\tfor <netfilter-devel@vger.kernel.org>; Wed,  6 May 2026 10:08:10 +0000 (UTC)","by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid B428D60D43; Wed, 06 May 2026 12:08:08 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1778062094; cv=none;\n b=XB7T4Rt3ss0hyX5OfZCWwc1eKmq9ENGfxt80GguoJno5iTjlR4hwToLgolq3lyd+HfuEONXDXqKjfAW7R+xK7xSfwOcXyFwiW6aeHpEK9jLlTX5tjK95NOobj88DpB4WrCT0bj+HwVX0sXno1shIF9WHCUdFgjDbaK3XZ03NUMk=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1778062094; c=relaxed/simple;\n\tbh=RPp1DnAOIHWfKhtQV+ziH64rN6cK2qAAB5zuX7b7E1g=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=GJE5lwSS7Mo5wyHO6/hap+ohz+fziwQe+xDXCILLDmwBvvdP+tteaNwsQF7syw7CEHCekR4rcsp1II70R+bTaYHcDUyjYPJyMHRsmSljBpN+ApE/JGvkoGCmInitxjJ5aBE44DDPEvYFzHbSwyYp8/Qba1TCYJtN+JOb0dIIE5U=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=strlen.de;\n spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc;\n arc=none smtp.client-ip=91.216.245.30","From":"Florian Westphal <fw@strlen.de>","To":"<netfilter-devel@vger.kernel.org>","Cc":"tristan@talencesecurity.com,\n\tFlorian Westphal <fw@strlen.de>","Subject":"[PATCH v3 nf 8/8] netfilter: x_tables: close dangling table module\n init race","Date":"Wed,  6 May 2026 12:07:20 +0200","Message-ID":"<20260506100728.2664-9-fw@strlen.de>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260506100728.2664-1-fw@strlen.de>","References":"<20260506100728.2664-1-fw@strlen.de>","Precedence":"bulk","X-Mailing-List":"netfilter-devel@vger.kernel.org","List-Id":"<netfilter-devel.vger.kernel.org>","List-Subscribe":"<mailto:netfilter-devel+subscribe@vger.kernel.org>","List-Unsubscribe":"<mailto:netfilter-devel+unsubscribe@vger.kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"Similar to the previous ebtables patch:\ntemplate add exposes the table to userspace, we must do this last to\nrnsure the pernet ops are set up (contain the destructors).\n\nFixes: fdacd57c79b7 (\"netfilter: x_tables: never register tables by default\")\nSigned-off-by: Florian Westphal <fw@strlen.de>\n---\n v3: fix error unwind pattern in iptable_nat.c\n\n net/ipv4/netfilter/arptable_filter.c   | 23 ++++++++++++-----------\n net/ipv4/netfilter/iptable_filter.c    | 23 ++++++++++++-----------\n net/ipv4/netfilter/iptable_mangle.c    | 25 +++++++++++++------------\n net/ipv4/netfilter/iptable_raw.c       | 22 +++++++++++-----------\n net/ipv4/netfilter/iptable_security.c  | 23 ++++++++++++-----------\n net/ipv6/netfilter/ip6table_filter.c   | 22 +++++++++++-----------\n net/ipv6/netfilter/ip6table_mangle.c   | 23 ++++++++++++-----------\n net/ipv6/netfilter/ip6table_raw.c      | 20 ++++++++++----------\n net/ipv6/netfilter/ip6table_security.c | 23 ++++++++++++-----------\n 9 files changed, 105 insertions(+), 99 deletions(-)","diff":"diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c\nindex 382345567a60..370b635e3523 100644\n--- a/net/ipv4/netfilter/arptable_filter.c\n+++ b/net/ipv4/netfilter/arptable_filter.c\n@@ -58,25 +58,26 @@ static struct pernet_operations arptable_filter_net_ops = {\n \n static int __init arptable_filter_init(void)\n {\n-\tint ret = xt_register_template(&packet_filter,\n-\t\t\t\t       arptable_filter_table_init);\n-\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tarpfilter_ops = xt_hook_ops_alloc(&packet_filter, arpt_do_table);\n-\tif (IS_ERR(arpfilter_ops)) {\n-\t\txt_unregister_template(&packet_filter);\n+\tif (IS_ERR(arpfilter_ops))\n \t\treturn PTR_ERR(arpfilter_ops);\n-\t}\n \n \tret = register_pernet_subsys(&arptable_filter_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&packet_filter,\n+\t\t\t\t   arptable_filter_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(&packet_filter);\n-\t\tkfree(arpfilter_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&arptable_filter_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(arpfilter_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c\nindex 0dea754a9120..672d7da1071d 100644\n--- a/net/ipv4/netfilter/iptable_filter.c\n+++ b/net/ipv4/netfilter/iptable_filter.c\n@@ -77,26 +77,27 @@ static struct pernet_operations iptable_filter_net_ops = {\n \n static int __init iptable_filter_init(void)\n {\n-\tint ret = xt_register_template(&packet_filter,\n-\t\t\t\t       iptable_filter_table_init);\n-\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tfilter_ops = xt_hook_ops_alloc(&packet_filter, ipt_do_table);\n-\tif (IS_ERR(filter_ops)) {\n-\t\txt_unregister_template(&packet_filter);\n+\tif (IS_ERR(filter_ops))\n \t\treturn PTR_ERR(filter_ops);\n-\t}\n \n \tret = register_pernet_subsys(&iptable_filter_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&packet_filter,\n+\t\t\t\t   iptable_filter_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(&packet_filter);\n-\t\tkfree(filter_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&iptable_filter_net_ops);\n+\t\tgoto err_free;\n \t}\n \n \treturn 0;\n+err_free:\n+\tkfree(filter_ops);\n+\treturn ret;\n }\n \n static void __exit iptable_filter_fini(void)\ndiff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c\nindex 4d3b12492308..13d25d9a4610 100644\n--- a/net/ipv4/netfilter/iptable_mangle.c\n+++ b/net/ipv4/netfilter/iptable_mangle.c\n@@ -111,25 +111,26 @@ static struct pernet_operations iptable_mangle_net_ops = {\n \n static int __init iptable_mangle_init(void)\n {\n-\tint ret = xt_register_template(&packet_mangler,\n-\t\t\t\t       iptable_mangle_table_init);\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tmangle_ops = xt_hook_ops_alloc(&packet_mangler, iptable_mangle_hook);\n-\tif (IS_ERR(mangle_ops)) {\n-\t\txt_unregister_template(&packet_mangler);\n-\t\tret = PTR_ERR(mangle_ops);\n-\t\treturn ret;\n-\t}\n+\tif (IS_ERR(mangle_ops))\n+\t\treturn PTR_ERR(mangle_ops);\n \n \tret = register_pernet_subsys(&iptable_mangle_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&packet_mangler,\n+\t\t\t\t   iptable_mangle_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(&packet_mangler);\n-\t\tkfree(mangle_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&iptable_mangle_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(mangle_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c\nindex 6f7afec7954b..2745c22f4034 100644\n--- a/net/ipv4/netfilter/iptable_raw.c\n+++ b/net/ipv4/netfilter/iptable_raw.c\n@@ -77,24 +77,24 @@ static int __init iptable_raw_init(void)\n \t\tpr_info(\"Enabling raw table before defrag\\n\");\n \t}\n \n-\tret = xt_register_template(table,\n-\t\t\t\t   iptable_raw_table_init);\n-\tif (ret < 0)\n-\t\treturn ret;\n-\n \trawtable_ops = xt_hook_ops_alloc(table, ipt_do_table);\n-\tif (IS_ERR(rawtable_ops)) {\n-\t\txt_unregister_template(table);\n+\tif (IS_ERR(rawtable_ops))\n \t\treturn PTR_ERR(rawtable_ops);\n-\t}\n \n \tret = register_pernet_subsys(&iptable_raw_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(table,\n+\t\t\t\t   iptable_raw_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(table);\n-\t\tkfree(rawtable_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&iptable_raw_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(rawtable_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv4/netfilter/iptable_security.c b/net/ipv4/netfilter/iptable_security.c\nindex 81175c20ccbe..491894511c54 100644\n--- a/net/ipv4/netfilter/iptable_security.c\n+++ b/net/ipv4/netfilter/iptable_security.c\n@@ -65,25 +65,26 @@ static struct pernet_operations iptable_security_net_ops = {\n \n static int __init iptable_security_init(void)\n {\n-\tint ret = xt_register_template(&security_table,\n-\t\t\t\t       iptable_security_table_init);\n-\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tsectbl_ops = xt_hook_ops_alloc(&security_table, ipt_do_table);\n-\tif (IS_ERR(sectbl_ops)) {\n-\t\txt_unregister_template(&security_table);\n+\tif (IS_ERR(sectbl_ops))\n \t\treturn PTR_ERR(sectbl_ops);\n-\t}\n \n \tret = register_pernet_subsys(&iptable_security_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&security_table,\n+\t\t\t\t   iptable_security_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(&security_table);\n-\t\tkfree(sectbl_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&iptable_security_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(sectbl_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c\nindex cf561919bde8..b074fc477676 100644\n--- a/net/ipv6/netfilter/ip6table_filter.c\n+++ b/net/ipv6/netfilter/ip6table_filter.c\n@@ -76,25 +76,25 @@ static struct pernet_operations ip6table_filter_net_ops = {\n \n static int __init ip6table_filter_init(void)\n {\n-\tint ret = xt_register_template(&packet_filter,\n-\t\t\t\t\tip6table_filter_table_init);\n-\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tfilter_ops = xt_hook_ops_alloc(&packet_filter, ip6t_do_table);\n-\tif (IS_ERR(filter_ops)) {\n-\t\txt_unregister_template(&packet_filter);\n+\tif (IS_ERR(filter_ops))\n \t\treturn PTR_ERR(filter_ops);\n-\t}\n \n \tret = register_pernet_subsys(&ip6table_filter_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&packet_filter, ip6table_filter_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(&packet_filter);\n-\t\tkfree(filter_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&ip6table_filter_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(filter_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c\nindex 1a758f2bc537..e6ee036a9b2c 100644\n--- a/net/ipv6/netfilter/ip6table_mangle.c\n+++ b/net/ipv6/netfilter/ip6table_mangle.c\n@@ -104,25 +104,26 @@ static struct pernet_operations ip6table_mangle_net_ops = {\n \n static int __init ip6table_mangle_init(void)\n {\n-\tint ret = xt_register_template(&packet_mangler,\n-\t\t\t\t       ip6table_mangle_table_init);\n-\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tmangle_ops = xt_hook_ops_alloc(&packet_mangler, ip6table_mangle_hook);\n-\tif (IS_ERR(mangle_ops)) {\n-\t\txt_unregister_template(&packet_mangler);\n+\tif (IS_ERR(mangle_ops))\n \t\treturn PTR_ERR(mangle_ops);\n-\t}\n \n \tret = register_pernet_subsys(&ip6table_mangle_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&packet_mangler,\n+\t\t\t\t   ip6table_mangle_table_init);\n \tif (ret < 0) {\n-\t\txt_unregister_template(&packet_mangler);\n-\t\tkfree(mangle_ops);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&ip6table_mangle_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(mangle_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c\nindex 923455921c1d..3b161ee875bc 100644\n--- a/net/ipv6/netfilter/ip6table_raw.c\n+++ b/net/ipv6/netfilter/ip6table_raw.c\n@@ -75,24 +75,24 @@ static int __init ip6table_raw_init(void)\n \t\tpr_info(\"Enabling raw table before defrag\\n\");\n \t}\n \n-\tret = xt_register_template(table, ip6table_raw_table_init);\n-\tif (ret < 0)\n-\t\treturn ret;\n-\n \t/* Register hooks */\n \trawtable_ops = xt_hook_ops_alloc(table, ip6t_do_table);\n-\tif (IS_ERR(rawtable_ops)) {\n-\t\txt_unregister_template(table);\n+\tif (IS_ERR(rawtable_ops))\n \t\treturn PTR_ERR(rawtable_ops);\n-\t}\n \n \tret = register_pernet_subsys(&ip6table_raw_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(table, ip6table_raw_table_init);\n \tif (ret < 0) {\n-\t\tkfree(rawtable_ops);\n-\t\txt_unregister_template(table);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&ip6table_raw_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(rawtable_ops);\n \treturn ret;\n }\n \ndiff --git a/net/ipv6/netfilter/ip6table_security.c b/net/ipv6/netfilter/ip6table_security.c\nindex c44834d93fc7..4bd5d97b8ab6 100644\n--- a/net/ipv6/netfilter/ip6table_security.c\n+++ b/net/ipv6/netfilter/ip6table_security.c\n@@ -64,25 +64,26 @@ static struct pernet_operations ip6table_security_net_ops = {\n \n static int __init ip6table_security_init(void)\n {\n-\tint ret = xt_register_template(&security_table,\n-\t\t\t\t       ip6table_security_table_init);\n-\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tint ret;\n \n \tsectbl_ops = xt_hook_ops_alloc(&security_table, ip6t_do_table);\n-\tif (IS_ERR(sectbl_ops)) {\n-\t\txt_unregister_template(&security_table);\n+\tif (IS_ERR(sectbl_ops))\n \t\treturn PTR_ERR(sectbl_ops);\n-\t}\n \n \tret = register_pernet_subsys(&ip6table_security_net_ops);\n+\tif (ret < 0)\n+\t\tgoto err_free;\n+\n+\tret = xt_register_template(&security_table,\n+\t\t\t\t   ip6table_security_table_init);\n \tif (ret < 0) {\n-\t\tkfree(sectbl_ops);\n-\t\txt_unregister_template(&security_table);\n-\t\treturn ret;\n+\t\tunregister_pernet_subsys(&ip6table_security_net_ops);\n+\t\tgoto err_free;\n \t}\n \n+\treturn 0;\n+err_free:\n+\tkfree(sectbl_ops);\n \treturn ret;\n }\n \n","prefixes":["v3","nf","8/8"]}