From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nf-next v3 1/6] netfilter: nf_log: remove dead ARPHRD_SIT handling from MAC/HW header logging
Date: Wed, 18 Nov 2026 18:39:08 +0100 [thread overview]
Message-ID: <20261118173913.22592-2-fw@strlen.de> (raw)
In-Reply-To: <20261118173913.22592-1-fw@strlen.de>
dump_mac_header() in nf_log_syslog.c and the HWHEADER dump in
nfnetlink_log.c special-case ARPHRD_SIT devices by backing the header
pointer up by ETH_HLEN before dumping dev->hard_header_len bytes, on the
assumption that a SIT tunnel's "hard header" covers the underlying
device's real Ethernet header plus the tunnel's IPv4 header.
That assumption stopped holding after commit 8ef9ba4d6666 ("IPv6: Set
SIT tunnel hard_header_len to zero"), which zeroed dev->hard_header_len
for SIT tunnels.
The syslog call site was gated on dev->hard_header_len being nonzero,
so the ARPHRD_SIT branch there has been unreachable dead code for every
SIT device ever since.
For nfnetlink_log the branch was still reachable, but the adjusted
pointer is never read: nla_put() for the NFULA_HWHEADER attribute uses
dev->hard_header_len as the length, which is 0 for SIT tunnels.
Remove the ARPHRD_SIT special-handling; it's been 6 years and no one
reported this ever since.
Also use the ingress device for the netlink message size estimate of
the hardware header attributes: skb->dev can have been repointed to a
device with a different hard_header_len before the hook runs (multicast
routing does so before the FORWARD hook), and it is dereferenced
without a NULL check.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/netfilter/nf_log_syslog.c | 17 +----------------
net/netfilter/nfnetlink_log.c | 8 ++------
2 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c
index c3fd398ffcd7..910f6975cdf7 100644
--- a/net/netfilter/nf_log_syslog.c
+++ b/net/netfilter/nf_log_syslog.c
@@ -820,26 +820,11 @@ static void dump_mac_header(struct nf_log_buf *m,
const unsigned char *p = skb_mac_header(skb);
unsigned int i;
- if (dev->type == ARPHRD_SIT) {
- p -= ETH_HLEN;
-
- if (p < skb->head)
- p = NULL;
- }
-
- if (p) {
+ if (1) {
nf_log_buf_add(m, "%02x", *p++);
for (i = 1; i < dev->hard_header_len; i++)
nf_log_buf_add(m, ":%02x", *p++);
}
-
- if (dev->type == ARPHRD_SIT) {
- const struct iphdr *iph =
- (struct iphdr *)skb_mac_header(skb);
-
- nf_log_buf_add(m, " TUNNEL=%pI4->%pI4", &iph->saddr,
- &iph->daddr);
- }
}
nf_log_buf_add(m, " ");
}
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index d923f2cb1398..90e87c34df85 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -610,11 +610,7 @@ __build_packet_message(struct nfnl_log_net *log,
hwhdrp = skb_mac_header(skb);
- if (skb->dev->type == ARPHRD_SIT)
- hwhdrp -= ETH_HLEN;
-
- if (hwhdrp >= skb->head &&
- nla_put(inst->skb, NFULA_HWHEADER,
+ if (nla_put(inst->skb, NFULA_HWHEADER,
skb->dev->hard_header_len, hwhdrp))
goto nla_put_failure;
}
@@ -772,7 +768,7 @@ nfulnl_log_packet(struct net *net,
+ nlmsg_total_size(sizeof(struct nfgenmsg)); /* NLMSG_DONE */
if (in && skb_mac_header_was_set(skb)) {
- size += nla_total_size(skb->dev->hard_header_len)
+ size += nla_total_size(in->hard_header_len)
+ nla_total_size(sizeof(u_int16_t)) /* hwtype */
+ nla_total_size(sizeof(u_int16_t)); /* hwlen */
}
--
2.56.1
next prev parent reply other threads:[~2026-11-18 17:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 17:39 [PATCH nf-next v3 0/6] netfilter: logging cleanups Florian Westphal
2026-11-18 17:39 ` Florian Westphal [this message]
2026-11-18 17:39 ` [PATCH nf-next v3 2/6] netfilter: nf_log_syslog: fix MAC header dump to use real header length Florian Westphal
2026-11-18 17:39 ` [PATCH nf-next v3 3/6] netfilter: nfnetlink_log: fix up dev_parse_header usage Florian Westphal
2026-11-18 17:39 ` [PATCH nf-next v3 4/6] netfilter: nfnetlink_log: use real mac header length for hwheader Florian Westphal
2026-11-18 17:39 ` [PATCH nf-next v3 5/6] netfilter: nfnetlink: don't log hwaddr/hwheader on output hooks Florian Westphal
2026-11-18 17:39 ` [PATCH nf-next v3 6/6] netfilter: nfnetlink_log: only add timestamp on the input path Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118173913.22592-2-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.