Skip to content

Commit b32e159

Browse files
Florian Westphalgregkh
authored andcommitted
netfilter: nf_reject: don't leak dst refcount for loopback packets
[ Upstream commit 91a79b7 ] recent patches to add a WARN() when replacing skb dst entry found an old bug: WARNING: include/linux/skbuff.h:1165 skb_dst_check_unset include/linux/skbuff.h:1164 [inline] WARNING: include/linux/skbuff.h:1165 skb_dst_set include/linux/skbuff.h:1210 [inline] WARNING: include/linux/skbuff.h:1165 nf_reject_fill_skb_dst+0x2a4/0x330 net/ipv4/netfilter/nf_reject_ipv4.c:234 [..] Call Trace: nf_send_unreach+0x17b/0x6e0 net/ipv4/netfilter/nf_reject_ipv4.c:325 nft_reject_inet_eval+0x4bc/0x690 net/netfilter/nft_reject_inet.c:27 expr_call_ops_eval net/netfilter/nf_tables_core.c:237 [inline] .. This is because blamed commit forgot about loopback packets. Such packets already have a dst_entry attached, even at PRE_ROUTING stage. Instead of checking hook just check if the skb already has a route attached to it. Fixes: f53b9b0 ("netfilter: introduce support for reject at prerouting stage") Signed-off-by: Florian Westphal <fw@strlen.de> Link: https://patch.msgid.link/20250820123707.10671-1-fw@strlen.de Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 13b8655 commit b32e159

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

net/ipv4/netfilter/nf_reject_ipv4.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,7 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
247247
if (!oth)
248248
return;
249249

250-
if ((hook == NF_INET_PRE_ROUTING || hook == NF_INET_INGRESS) &&
251-
nf_reject_fill_skb_dst(oldskb) < 0)
250+
if (!skb_dst(oldskb) && nf_reject_fill_skb_dst(oldskb) < 0)
252251
return;
253252

254253
if (skb_rtable(oldskb)->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
@@ -321,8 +320,7 @@ void nf_send_unreach(struct sk_buff *skb_in, int code, int hook)
321320
if (iph->frag_off & htons(IP_OFFSET))
322321
return;
323322

324-
if ((hook == NF_INET_PRE_ROUTING || hook == NF_INET_INGRESS) &&
325-
nf_reject_fill_skb_dst(skb_in) < 0)
323+
if (!skb_dst(skb_in) && nf_reject_fill_skb_dst(skb_in) < 0)
326324
return;
327325

328326
if (skb_csum_unnecessary(skb_in) ||

net/ipv6/netfilter/nf_reject_ipv6.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
293293
fl6.fl6_sport = otcph->dest;
294294
fl6.fl6_dport = otcph->source;
295295

296-
if (hook == NF_INET_PRE_ROUTING || hook == NF_INET_INGRESS) {
296+
if (!skb_dst(oldskb)) {
297297
nf_ip6_route(net, &dst, flowi6_to_flowi(&fl6), false);
298298
if (!dst)
299299
return;
@@ -397,8 +397,7 @@ void nf_send_unreach6(struct net *net, struct sk_buff *skb_in,
397397
if (hooknum == NF_INET_LOCAL_OUT && skb_in->dev == NULL)
398398
skb_in->dev = net->loopback_dev;
399399

400-
if ((hooknum == NF_INET_PRE_ROUTING || hooknum == NF_INET_INGRESS) &&
401-
nf_reject6_fill_skb_dst(skb_in) < 0)
400+
if (!skb_dst(skb_in) && nf_reject6_fill_skb_dst(skb_in) < 0)
402401
return;
403402

404403
icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0);

0 commit comments

Comments
 (0)