BPF List
 help / color / mirror / Atom feed
* [PATCH bpf 1/2] bpf: lwt: fix NULL deref in IPv6 reroute
@ 2026-11-22  4:13 Jiayuan Chen
  2026-11-22  4:13 ` [PATCH bpf 2/2] selftests/bpf: test lwt_xmit reroute of an IPv4-in-IPv6 encap Jiayuan Chen
  0 siblings, 1 reply; 2+ messages in thread
From: Jiayuan Chen @ 2026-11-22  4:13 UTC (permalink / raw)
  To: bpf
  Cc: Jiayuan Chen, David S. Miller, Eric Dumazet, Jakub Kicinski,
	Paolo Abeni, Simon Horman, Alexei Starovoitov, Daniel Borkmann,
	Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi,
	Martin KaFai Lau, Song Liu, Yonghong Song, Jiri Olsa,
	Emil Tsalapatis, Ihor Solodrai, Shuah Khan,
	Fernando Fernandez Mancera, Junseo Lim, Xuanqiang Luo, Leon Hwang,
	Yuqiang Sun, Peter Oskolkov, netdev, linux-kselftest

After an lwt prog pushed an IPv6 header, bpf_lwt_xmit_reroute() hands
skb->sk to ip6_dst_lookup_flow(). When the flow has no source address,
the lookup reads inet6_sk(sk)->srcprefs, and inet6_sk() is NULL for
example when:

 - skb->sk is a request_sock, e.g. for a SYN-ACK.
 - skb->sk is an IPv4 socket, the IPv6 header was pushed on an IPv4
   packet.

KASAN: null-ptr-deref in range [0x0000000000000040-0x0000000000000047]
RIP: 0010:ip6_route_output_flags+0x279/0x4c0
Call Trace:
 <TASK>
 ip6_dst_lookup_tail.constprop.0+0x26e/0x1050
 ip6_dst_lookup_flow+0x101/0x1e0
 bpf_lwt_xmit_reroute+0xc18/0x18b0
 bpf_xmit+0x28f/0x400
 lwtunnel_xmit+0x2a7/0x620
 ip_finish_output2+0xa67/0x1f80
 __ip_finish_output+0x510/0x7e0
 ip_finish_output+0x2f/0x320
 ip_output+0x171/0x3e0
 ip_push_pending_frames+0x200/0x260
 raw_sendmsg+0x114c/0x3680
 inet_sendmsg+0xdf/0x100
 __sys_sendto+0x3ef/0x500
 __x64_sys_sendto+0xe0/0x1b0
 x64_sys_call+0x1375/0x27e0
 do_syscall_64+0xe7/0x630
 entry_SYSCALL_64_after_hwframe+0x76/0x7e
 </TASK>

Pass the full socket, and no socket if it is not an IPv6 one while the
flow has no source address.

Fixes: 3bd0b15281af ("bpf: add handling of BPF_LWT_REROUTE to lwt_bpf.c")
Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
---
 net/core/lwt_bpf.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c
index 72c86ff2a847..33f710d92106 100644
--- a/net/core/lwt_bpf.c
+++ b/net/core/lwt_bpf.c
@@ -278,7 +278,11 @@ static int bpf_lwt_xmit_reroute(struct sk_buff *skb)
 		fl6.daddr = iph6->daddr;
 		fl6.saddr = iph6->saddr;
 
-		dst = ip6_dst_lookup_flow(net, skb->sk, &fl6, NULL);
+		if (ipv6_addr_any(&fl6.saddr) &&
+		    sk && sk->sk_family != AF_INET6)
+			sk = NULL;
+
+		dst = ip6_dst_lookup_flow(net, sk, &fl6, NULL);
 		if (IS_ERR(dst)) {
 			err = PTR_ERR(dst);
 			goto err;
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-22  4:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-22  4:13 [PATCH bpf 1/2] bpf: lwt: fix NULL deref in IPv6 reroute Jiayuan Chen
2026-11-22  4:13 ` [PATCH bpf 2/2] selftests/bpf: test lwt_xmit reroute of an IPv4-in-IPv6 encap Jiayuan Chen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox