{"id":2224496,"url":"http://patchwork.ozlabs.org/api/patches/2224496/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260417131910.17932-1-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/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":"<20260417131910.17932-1-fw@strlen.de>","list_archive_url":null,"date":"2026-04-17T13:19:05","name":"[nf] netfilter: arp_tables: fix IEEE1394 ARP payload mangling","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"59a387faa4c3ea3eec363ef004d2f9c7c295d43d","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":11902,"url":"http://patchwork.ozlabs.org/api/users/11902/?format=json","username":"strlen","first_name":"Florian","last_name":"Westphal","email":"fw@strlen.de"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260417131910.17932-1-fw@strlen.de/mbox/","series":[{"id":500337,"url":"http://patchwork.ozlabs.org/api/series/500337/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=500337","date":"2026-04-17T13:19:05","name":"[nf] netfilter: arp_tables: fix IEEE1394 ARP payload mangling","version":1,"mbox":"http://patchwork.ozlabs.org/series/500337/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224496/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224496/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:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-12001-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 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fxwWJ5Zdrz1yDF\n\tfor ; Fri, 17 Apr 2026 23:21:16 +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 9479C30B690C\n\tfor ; Fri, 17 Apr 2026 13:19:24 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 62FA23932FB;\n\tFri, 17 Apr 2026 13:19:24 +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 4CB7B39D6E5\n\tfor ; Fri, 17 Apr 2026 13:19:22 +0000 (UTC)","by Chamillionaire.breakpoint.cc (Postfix, from userid 1003)\n\tid 478A860301; Fri, 17 Apr 2026 15:19:15 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776431964; cv=none;\n b=XeqxvFsUx1c01Q1InhBXykSEKmIE299TeSo9XXT18NTWPGwVQXmQ7avRTDcWG8ztyUmFWlTxsFG5bWw2CGEA/diAceU6/uQ4gs467VKmwn6yK3AHt1ufE1n0ofTxoN1TI7x8yFSdMNeBr4EAuXbeHsAOcO/pQr7p8/MwSa945+g=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776431964; c=relaxed/simple;\n\tbh=NXsNJmjEDNJ1ab2syQQd0ymCfmmePOx4N7AbtgrxcYY=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=ltmvJW36kyLpLzvVfshVXXXJc3gOsJY7h1fcLOVSSChjj62Y7K1gwl1jzf9za8zk3EdfzSdiBqkZB5Gkc5u1eoGlMpXNBcLuQa5yGAq3sj+mUB0UeemNUTQ1GutXqW2QM60ubymVgE4s+Kh64S5rpr2sDYQmYQPiLMKV1650Hd8=","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":"Florian Westphal ","Subject":"[PATCH nf] netfilter: arp_tables: fix IEEE1394 ARP payload mangling","Date":"Fri, 17 Apr 2026 15:19:05 +0200","Message-ID":"<20260417131910.17932-1-fw@strlen.de>","X-Mailer":"git-send-email 2.52.0","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":"sashiko.dev noticed that similar bug pattern exists in arpt_mangle:\n \"IEEE1394 ARP payloads omit the target hardware address, advancing\n arpptr by hln after the source IP address skips over the actual target\n IP address.\"\n\nApply similar fix: check dev->type. If we're asked to mangle what\ndoesn't exist, drop the packet.\n\nFixes: 6752c8db8e0c (\"firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.\")\nSigned-off-by: Florian Westphal \n---\n Collides with a inflight patch.\n I'll rebase or discard depending on what netdev@ does.\n\n net/ipv4/netfilter/arpt_mangle.c | 23 ++++++++++++++++++++++-\n 1 file changed, 22 insertions(+), 1 deletion(-)","diff":"diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c\nindex a4e07e5e9c11..5a3560e1b59b 100644\n--- a/net/ipv4/netfilter/arpt_mangle.c\n+++ b/net/ipv4/netfilter/arpt_mangle.c\n@@ -13,6 +13,7 @@ static unsigned int\n target(struct sk_buff *skb, const struct xt_action_param *par)\n {\n \tconst struct arpt_mangle *mangle = par->targinfo;\n+\tbool has_tgt_devaddr = true;\n \tconst struct arphdr *arp;\n \tunsigned char *arpptr;\n \tint pln, hln;\n@@ -39,13 +40,33 @@ target(struct sk_buff *skb, const struct xt_action_param *par)\n \t\tmemcpy(arpptr, &mangle->u_s.src_ip, pln);\n \t}\n \tarpptr += pln;\n+\n+\tif (IS_ENABLED(CONFIG_FIREWIRE_NET)) {\n+\t\tconst struct net_device *dev = skb->dev;\n+\n+\t\tif (!dev) {\n+\t\t\t/* can't munge without arphrd type. */\n+\t\t\tif (mangle->flags & (ARPT_MANGLE_TDEV|ARPT_MANGLE_TIP))\n+\t\t\t\treturn NF_DROP;\n+\t\t\treturn mangle->target;\n+\t\t}\n+\n+\t\tif (dev->type == ARPHRD_IEEE1394)\n+\t\t\thas_tgt_devaddr = false;\n+\t}\n+\n \tif (mangle->flags & ARPT_MANGLE_TDEV) {\n+\t\tif (!has_tgt_devaddr)\n+\t\t\treturn NF_DROP;\n+\n \t\tif (ARPT_DEV_ADDR_LEN_MAX < hln ||\n \t\t (arpptr + hln > skb_tail_pointer(skb)))\n \t\t\treturn NF_DROP;\n \t\tmemcpy(arpptr, mangle->tgt_devaddr, hln);\n \t}\n-\tarpptr += hln;\n+\tif (has_tgt_devaddr)\n+\t\tarpptr += hln;\n+\n \tif (mangle->flags & ARPT_MANGLE_TIP) {\n \t\tif (ARPT_MANGLE_ADDR_LEN_MAX < pln ||\n \t\t (arpptr + pln > skb_tail_pointer(skb)))\n","prefixes":["nf"]}