Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2217792/?format=api
{ "id": 2217792, "url": "http://patchwork.ozlabs.org/api/patches/2217792/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260330151009.899791-1-pablo@netfilter.org/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/projects/26/?format=api", "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, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260330151009.899791-1-pablo@netfilter.org>", "list_archive_url": null, "date": "2026-03-30T15:10:09", "name": "[nf-next] netfilter: ctnetlink: restrict expectfn to helper", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "8d45fcdcee75b0395adf4640bbba4fd3d558a5bd", "submitter": { "id": 1315, "url": "http://patchwork.ozlabs.org/api/people/1315/?format=api", "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260330151009.899791-1-pablo@netfilter.org/mbox/", "series": [ { "id": 498054, "url": "http://patchwork.ozlabs.org/api/series/498054/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=498054", "date": "2026-03-30T15:10:09", "name": "[nf-next] netfilter: ctnetlink: restrict expectfn to helper", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498054/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2217792/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2217792/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <netfilter-devel+bounces-11501-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\tdkim=pass (2048-bit key;\n unprotected) header.d=netfilter.org header.i=@netfilter.org\n header.a=rsa-sha256 header.s=2025 header.b=bR7ShZpJ;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11501-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=\"bR7ShZpJ\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=217.70.190.124", "smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org", "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=netfilter.org" ], "Received": [ "from tor.lore.kernel.org (tor.lore.kernel.org\n [IPv6:2600:3c04:e001:36c::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 4fkw3W747rz1xtJ\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 31 Mar 2026 02:22:31 +1100 (AEDT)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 379E1307C2D8\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 30 Mar 2026 15:10:18 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 44288338925;\n\tMon, 30 Mar 2026 15:10:17 +0000 (UTC)", "from mail.netfilter.org (mail.netfilter.org [217.70.190.124])\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 EF3AA329E46\n\tfor <netfilter-devel@vger.kernel.org>; Mon, 30 Mar 2026 15:10:14 +0000 (UTC)", "from localhost.localdomain (mail-agni [217.70.190.124])\n\tby mail.netfilter.org (Postfix) with ESMTPSA id 173286024E\n\tfor <netfilter-devel@vger.kernel.org>; Mon, 30 Mar 2026 17:10:13 +0200 (CEST)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1774883416; cv=none;\n b=AR7m/YIXsvRQVTVbWH8K+d6mTXtpe41gC0ktFQmv/V7DZk1/YEnPo9JV++GaKA4DubPfn+JKb64zJWD3w2YPsck9bYIErZz1E2VhXpFLtnyFCUz294opesbjidg6YiM24i1HR+5HME7IEp/avkJjW8U9U5PsYB7v6yhbi1wDYF8=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1774883416; c=relaxed/simple;\n\tbh=26u80zraHET5MW6A+1LmX99Lq2OXlhG/XMYQvk26/pg=;\n\th=From:To:Subject:Date:Message-ID:MIME-Version;\n b=VMLTpz2SVbZykL+hNCJwrpiGn35QZcguxKZoDWf3K/vQvGZfchdUF8nxP5U3s5mqnYZr7clPBQEkNo7bAe9HYASPwGYyC8ZeXQtDSHURLeBsPCniyObbjdupFRTT+0cRVmJ/HiJsW+FGwgyIqKwoPy/IOWKuXF1F6Gd1j+zO42k=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org;\n spf=pass smtp.mailfrom=netfilter.org;\n dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=bR7ShZpJ; arc=none smtp.client-ip=217.70.190.124", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org;\n\ts=2025; t=1774883413;\n\tbh=ZZEtAQbDPTHikEMtHCyHnLBBeltm/bnHHnxDE3NQn6A=;\n\th=From:To:Subject:Date:From;\n\tb=bR7ShZpJcfd3CkXrQKjG+WExzps7zNjzvAj+wVu5HNuGsbms+cUSEJasDE5qb72pc\n\t 0VzNvhFvh06nlvx3BnFtJEjIsNCZCnTKQMUcjdJBIkbWsKzhnl1IN1Y7YXgZbmfZGj\n\t PueEkTwoVDFbhfXo1v4hHrWQqER1FBo4Y6ZzenNRP0xrKao/ebqOe8zFhkXZfsw/hp\n\t Ybz56QK5tL8B5lv5nRNRSDkVZQgLX+5k0pkhFa7UpEJKog8tjtTvGbaidxGQtOdDmn\n\t FKASXbV1O59QUkdFrliJ+pyuuz4MQ5gZ6QCYwzSjw84xYetn8PuJkfwiKHDMRXd/gP\n\t cMb4S1zuV5rxg==", "From": "Pablo Neira Ayuso <pablo@netfilter.org>", "To": "netfilter-devel@vger.kernel.org", "Subject": "[PATCH nf-next] netfilter: ctnetlink: restrict expectfn to helper", "Date": "Mon, 30 Mar 2026 17:10:09 +0200", "Message-ID": "<20260330151009.899791-1-pablo@netfilter.org>", "X-Mailer": "git-send-email 2.47.3", "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": "The expectfn callback determines how nf_nat_setup_info() is invoked for\nthis expectation.\n\nThis patch restricts expectfn to the master conntrack helper, there is\nnf_nat_follow_master() that is used by most expectations to deal with\nnat. However, sip and h.323 helpers still offer their own variants for\ndifferent purpose.\n\nAdd a new helper field to struct nf_ct_helper_expectfn to restrict the\nexpectfn to its helper. If NULL, then this can be used by any\nexpectation, which is the case nf_nat_follow_master().\n\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\ntargetting nf-next, I think this can only lead to NAT misconfigurations\nwhen trying to use expectfn, this infrastructure was added for\nconntrackd a lot time ago.\n\n include/net/netfilter/nf_conntrack_helper.h | 3 ++-\n net/ipv4/netfilter/nf_nat_h323.c | 2 ++\n net/netfilter/nf_conntrack_helper.c | 5 +++--\n net/netfilter/nf_conntrack_netlink.c | 2 +-\n net/netfilter/nf_nat_sip.c | 1 +\n 5 files changed, 9 insertions(+), 4 deletions(-)", "diff": "diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h\nindex de2f956abf34..dc566921cc73 100644\n--- a/include/net/netfilter/nf_conntrack_helper.h\n+++ b/include/net/netfilter/nf_conntrack_helper.h\n@@ -145,6 +145,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, struct nf_conn *ct,\n \n struct nf_ct_helper_expectfn {\n \tstruct list_head head;\n+\tconst char *helper;\n \tconst char *name;\n \tvoid (*expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);\n };\n@@ -156,7 +157,7 @@ void nf_ct_helper_log(struct sk_buff *skb, const struct nf_conn *ct,\n void nf_ct_helper_expectfn_register(struct nf_ct_helper_expectfn *n);\n void nf_ct_helper_expectfn_unregister(struct nf_ct_helper_expectfn *n);\n struct nf_ct_helper_expectfn *\n-nf_ct_helper_expectfn_find_by_name(const char *name);\n+nf_ct_helper_expectfn_find_by_name(const char *helper, const char *name);\n struct nf_ct_helper_expectfn *\n nf_ct_helper_expectfn_find_by_symbol(const void *symbol);\n \ndiff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c\nindex faee20af4856..21353623130c 100644\n--- a/net/ipv4/netfilter/nf_nat_h323.c\n+++ b/net/ipv4/netfilter/nf_nat_h323.c\n@@ -518,11 +518,13 @@ static int nat_callforwarding(struct sk_buff *skb, struct nf_conn *ct,\n }\n \n static struct nf_ct_helper_expectfn q931_nat = {\n+\t.helper\t\t= \"RAS\",\n \t.name\t\t= \"Q.931\",\n \t.expectfn\t= ip_nat_q931_expect,\n };\n \n static struct nf_ct_helper_expectfn callforwarding_nat = {\n+\t.helper\t\t= \"Q.931\",\n \t.name\t\t= \"callforwarding\",\n \t.expectfn\t= ip_nat_callforwarding_expect,\n };\ndiff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c\nindex a715304a53d8..5e6d2687a558 100644\n--- a/net/netfilter/nf_conntrack_helper.c\n+++ b/net/netfilter/nf_conntrack_helper.c\n@@ -285,13 +285,14 @@ EXPORT_SYMBOL_GPL(nf_ct_helper_expectfn_unregister);\n \n /* Caller should hold the rcu lock */\n struct nf_ct_helper_expectfn *\n-nf_ct_helper_expectfn_find_by_name(const char *name)\n+nf_ct_helper_expectfn_find_by_name(const char *helper, const char *name)\n {\n \tstruct nf_ct_helper_expectfn *cur;\n \tbool found = false;\n \n \tlist_for_each_entry_rcu(cur, &nf_ct_helper_expectfn_list, head) {\n-\t\tif (!strcmp(cur->name, name)) {\n+\t\tif ((cur->helper && !strcmp(cur->helper, helper)) ||\n+\t\t !strcmp(cur->name, name)) {\n \t\t\tfound = true;\n \t\t\tbreak;\n \t\t}\ndiff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c\nindex ec6771a0926c..fe787e410188 100644\n--- a/net/netfilter/nf_conntrack_netlink.c\n+++ b/net/netfilter/nf_conntrack_netlink.c\n@@ -3554,7 +3554,7 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,\n \t\tconst char *name = nla_data(cda[CTA_EXPECT_FN]);\n \t\tstruct nf_ct_helper_expectfn *expfn;\n \n-\t\texpfn = nf_ct_helper_expectfn_find_by_name(name);\n+\t\texpfn = nf_ct_helper_expectfn_find_by_name(helper->name, name);\n \t\tif (expfn == NULL) {\n \t\t\terr = -EINVAL;\n \t\t\tgoto err_out;\ndiff --git a/net/netfilter/nf_nat_sip.c b/net/netfilter/nf_nat_sip.c\nindex cf4aeb299bde..047733012963 100644\n--- a/net/netfilter/nf_nat_sip.c\n+++ b/net/netfilter/nf_nat_sip.c\n@@ -641,6 +641,7 @@ static unsigned int nf_nat_sdp_media(struct sk_buff *skb, unsigned int protoff,\n }\n \n static struct nf_ct_helper_expectfn sip_nat = {\n+\t.helper\t\t= \"sip\",\n \t.name\t\t= \"sip\",\n \t.expectfn\t= nf_nat_sip_expected,\n };\n", "prefixes": [ "nf-next" ] }