{"id":2221776,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2221776/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260410112352.23599-6-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260410112352.23599-6-fw@strlen.de>","list_archive_url":null,"date":"2026-04-10T11:23:46","name":"[net-next,05/11] netfilter: nfnetlink: prefer skb_mac_header helpers","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":true,"hash":"d3fe3ecdc9eaabe2fcea7f90047d77dfab37042e","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.2/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260410112352.23599-6-fw@strlen.de/mbox/","series":[{"id":499444,"url":"http://patchwork.ozlabs.org/api/1.2/series/499444/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=499444","date":"2026-04-10T11:23:46","name":"[net-next,01/11] ipvs: show the current conn_tab size to users","version":1,"mbox":"http://patchwork.ozlabs.org/series/499444/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2221776/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221776/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","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:3c09:e001:a7::12fc:5321; helo=sto.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11801-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 sto.lore.kernel.org (sto.lore.kernel.org\n [IPv6:2600:3c09:e001:a7::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 4fsZFj4QlJz1y2d\n\tfor ; Fri, 10 Apr 2026 21:24:25 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 86F2B302A368\n\tfor ; Fri, 10 Apr 2026 11:24:22 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id D385F3A0E84;\n\tFri, 10 Apr 2026 11:24:20 +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 33F4239DBEB;\n\tFri, 10 Apr 2026 11:24:19 +0000 (UTC)","by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid E41CF6065F; Fri, 10 Apr 2026 13:24:17 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775820260; cv=none;\n b=rwEFeEJqA3IodVQYteR5EK3WOfpU+Rd6c1Sgoq5lkhrMfGkdiF3cCNPK4EA1xbAnYWjVo1/3+nz9wIGocqZcgpZOcF/+YTnhepK7+NwGp8VRr0mmqAB9c7h0fC3DdNaVZYslu8UEsmaDLvs+d2jUP+SuN8fzIfYi/x5YD7ldb9I=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775820260; c=relaxed/simple;\n\tbh=pIrTkanCiDQpmujH5RjT+aLdBLhafdd2InFmW1v3e5A=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=pnsdw6owY57wyYzBNShFXx/5BkjGe70Ypz/SUeMdiqUb+HyvV92t1uVEJZVLP/qI+Il8qEQtxa10W11A9RG96svITTF6DKEQx5A51Bfa+ekxYS7LEnhmx31a9JnN/WMb81kkvy1fWNaoGXSS4Ho+9jUyNg+hTdu0Y9jYtGuhZjU=","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 ","To":"","Cc":"Paolo Abeni ,\n\t\"David S. Miller\" ,\n\tEric Dumazet ,\n\tJakub Kicinski ,\n\t,\n\tpablo@netfilter.org","Subject":"[PATCH net-next 05/11] netfilter: nfnetlink: prefer skb_mac_header\n helpers","Date":"Fri, 10 Apr 2026 13:23:46 +0200","Message-ID":"<20260410112352.23599-6-fw@strlen.de>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260410112352.23599-1-fw@strlen.de>","References":"<20260410112352.23599-1-fw@strlen.de>","Precedence":"bulk","X-Mailing-List":"netfilter-devel@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","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 \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 b2c24cb919d4..2439cbbd5b26 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 c7ee6f6ff725..58304fd1f70f 100644\n--- a/net/netfilter/nfnetlink_queue.c\n+++ b/net/netfilter/nfnetlink_queue.c\n@@ -579,6 +579,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@@ -587,9 +588,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@@ -597,6 +598,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@@ -615,12 +617,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@@ -1004,13 +1004,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@@ -1469,8 +1469,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":["net-next","05/11"]}