Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2219774/?format=api
{ "id": 2219774, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2219774/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260404100909.19412-1-fw@strlen.de/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/1.1/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 }, "msgid": "<20260404100909.19412-1-fw@strlen.de>", "date": "2026-04-04T10:09:05", "name": "[nf-next,v2] netfilter: nfnetlink: prefer skb_mac_header helpers", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "d3fe3ecdc9eaabe2fcea7f90047d77dfab37042e", "submitter": { "id": 1025, "url": "http://patchwork.ozlabs.org/api/1.1/people/1025/?format=api", "name": "Florian Westphal", "email": "fw@strlen.de" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260404100909.19412-1-fw@strlen.de/mbox/", "series": [ { "id": 498712, "url": "http://patchwork.ozlabs.org/api/1.1/series/498712/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=498712", "date": "2026-04-04T10:09:05", "name": "[nf-next,v2] netfilter: nfnetlink: prefer skb_mac_header helpers", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/498712/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2219774/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2219774/checks/", "tags": {}, "headers": { "Return-Path": "\n <netfilter-devel+bounces-11629-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:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11629-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 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 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fnrt41kwDz1yCs\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 04 Apr 2026 21:09:32 +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 613283013736\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 4 Apr 2026 10:09:24 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 045963A9DA7;\n\tSat, 4 Apr 2026 10:09:21 +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 084E633554B\n\tfor <netfilter-devel@vger.kernel.org>; Sat, 4 Apr 2026 10:09:17 +0000 (UTC)", "by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid D1D556079E; Sat, 04 Apr 2026 12:09:15 +0200 (CEST)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775297359; cv=none;\n b=fIadN3JwsKYGjvjZt3y2HOj1Djig7bf4p7Grie/CHeRdDDsItwEG/mL00JDnkNJK5szHHpe+TOP5FN3KZb7kEO338WdrmsdYyh4o3tYXlnWrtPotoNYGaSKM9uU+wnHcz12951mP3pxoA62V6f30Kv3Vd1ZiflZlsqCfvfIybu0=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775297359; c=relaxed/simple;\n\tbh=4RNuESg17tAqqEpID/6fI9k4pqlM8AXbSMyzfTSooYI=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=VVpqSOESgos25xA4l0+hw+exTM+YivxrxoKWV5/50Bo+65eCedidt8kbt/3hOUKmy7HQF299E81QJVHFYn6fyscXiDJHdKTI0QDiD4q70W/5DYBk5NBdEW+HRdbCJT95KX4O/qvuZWlk3ZN/e2eeAdi5MM/458eJKvEGZq27LJw=", "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": "Florian Westphal <fw@strlen.de>", "Subject": "[PATCH nf-next v2] netfilter: nfnetlink: prefer skb_mac_header\n helpers", "Date": "Sat, 4 Apr 2026 12:09:05 +0200", "Message-ID": "<20260404100909.19412-1-fw@strlen.de>", "X-Mailer": "git-send-email 2.53.0", "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": "This adds implicit DEBUG_WARN_ON_ONCE for debug configurations.\nNo other changes intended.\n\nSigned-off-by: Florian Westphal <fw@strlen.de>\n---\n v2: also convert nfnetlink_log (spotted by Pablo)\n\n net/netfilter/nfnetlink_log.c | 19 ++++++++++---------\n net/netfilter/nfnetlink_queue.c | 25 ++++++++++++-------------\n 2 files changed, 22 insertions(+), 22 deletions(-)", "diff": "diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c\nindex 3e08e3212983..009e18b542aa 100644\n--- a/net/netfilter/nfnetlink_log.c\n+++ b/net/netfilter/nfnetlink_log.c\n@@ -401,7 +401,7 @@ nfulnl_timer(struct timer_list *t)\n \n static u32 nfulnl_get_bridge_size(const struct sk_buff *skb)\n {\n-\tu32 size = 0;\n+\tu32 mac_len, size = 0;\n \n \tif (!skb_mac_header_was_set(skb))\n \t\treturn 0;\n@@ -412,14 +412,17 @@ static u32 nfulnl_get_bridge_size(const struct sk_buff *skb)\n \t\tsize += nla_total_size(sizeof(u16)); /* tag */\n \t}\n \n-\tif (skb->network_header > skb->mac_header)\n-\t\tsize += nla_total_size(skb->network_header - skb->mac_header);\n+\tmac_len = skb_mac_header_len(skb);\n+\tif (mac_len > 0)\n+\t\tsize += nla_total_size(mac_len);\n \n \treturn size;\n }\n \n static int nfulnl_put_bridge(struct nfulnl_instance *inst, const struct sk_buff *skb)\n {\n+\tu32 mac_len;\n+\n \tif (!skb_mac_header_was_set(skb))\n \t\treturn 0;\n \n@@ -437,12 +440,10 @@ static int nfulnl_put_bridge(struct nfulnl_instance *inst, const struct sk_buff\n \t\tnla_nest_end(inst->skb, nest);\n \t}\n \n-\tif (skb->mac_header < skb->network_header) {\n-\t\tint len = (int)(skb->network_header - skb->mac_header);\n-\n-\t\tif (nla_put(inst->skb, NFULA_L2HDR, len, skb_mac_header(skb)))\n-\t\t\tgoto nla_put_failure;\n-\t}\n+\tmac_len = skb_mac_header_len(skb);\n+\tif (mac_len > 0 &&\n+\t nla_put(inst->skb, NFULA_L2HDR, mac_len, skb_mac_header(skb)))\n+\t\tgoto nla_put_failure;\n \n \treturn 0;\n \ndiff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c\nindex 4e579ddb7428..3fd1dfc0c105 100644\n--- a/net/netfilter/nfnetlink_queue.c\n+++ b/net/netfilter/nfnetlink_queue.c\n@@ -602,6 +602,7 @@ static u32 nfqnl_get_bridge_size(struct nf_queue_entry *entry)\n {\n \tstruct sk_buff *entskb = entry->skb;\n \tu32 nlalen = 0;\n+\tu32 mac_len;\n \n \tif (entry->state.pf != PF_BRIDGE || !skb_mac_header_was_set(entskb))\n \t\treturn 0;\n@@ -610,9 +611,9 @@ static u32 nfqnl_get_bridge_size(struct nf_queue_entry *entry)\n \t\tnlalen += nla_total_size(nla_total_size(sizeof(__be16)) +\n \t\t\t\t\t nla_total_size(sizeof(__be16)));\n \n-\tif (entskb->network_header > entskb->mac_header)\n-\t\tnlalen += nla_total_size((entskb->network_header -\n-\t\t\t\t\t entskb->mac_header));\n+\tmac_len = skb_mac_header_len(entskb);\n+\tif (mac_len > 0)\n+\t\tnlalen += nla_total_size(mac_len);\n \n \treturn nlalen;\n }\n@@ -620,6 +621,7 @@ static u32 nfqnl_get_bridge_size(struct nf_queue_entry *entry)\n static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)\n {\n \tstruct sk_buff *entskb = entry->skb;\n+\tu32 mac_len;\n \n \tif (entry->state.pf != PF_BRIDGE || !skb_mac_header_was_set(entskb))\n \t\treturn 0;\n@@ -638,12 +640,10 @@ static int nfqnl_put_bridge(struct nf_queue_entry *entry, struct sk_buff *skb)\n \t\tnla_nest_end(skb, nest);\n \t}\n \n-\tif (entskb->mac_header < entskb->network_header) {\n-\t\tint len = (int)(entskb->network_header - entskb->mac_header);\n-\n-\t\tif (nla_put(skb, NFQA_L2HDR, len, skb_mac_header(entskb)))\n-\t\t\tgoto nla_put_failure;\n-\t}\n+\tmac_len = skb_mac_header_len(entskb);\n+\tif (mac_len > 0 &&\n+\t nla_put(skb, NFQA_L2HDR, mac_len, skb_mac_header(entskb)))\n+\t\tgoto nla_put_failure;\n \n \treturn 0;\n \n@@ -1027,13 +1027,13 @@ nf_queue_entry_dup(struct nf_queue_entry *e)\n static void nf_bridge_adjust_skb_data(struct sk_buff *skb)\n {\n \tif (nf_bridge_info_get(skb))\n-\t\t__skb_push(skb, skb->network_header - skb->mac_header);\n+\t\t__skb_push(skb, skb_mac_header_len(skb));\n }\n \n static void nf_bridge_adjust_segmented_data(struct sk_buff *skb)\n {\n \tif (nf_bridge_info_get(skb))\n-\t\t__skb_pull(skb, skb->network_header - skb->mac_header);\n+\t\t__skb_pull(skb, skb_mac_header_len(skb));\n }\n #else\n #define nf_bridge_adjust_skb_data(s) do {} while (0)\n@@ -1492,8 +1492,7 @@ static int nfqa_parse_bridge(struct nf_queue_entry *entry,\n \t}\n \n \tif (nfqa[NFQA_L2HDR]) {\n-\t\tint mac_header_len = entry->skb->network_header -\n-\t\t\tentry->skb->mac_header;\n+\t\tu32 mac_header_len = skb_mac_header_len(entry->skb);\n \n \t\tif (mac_header_len != nla_len(nfqa[NFQA_L2HDR]))\n \t\t\treturn -EINVAL;\n", "prefixes": [ "nf-next", "v2" ] }