Reference in a new issue

Blame

Copy permalink

Reference in a new issue

Copy permalink

Toke Høiland-Jørgensen 4e1e428533 bpf: Make sure internal and UAPI bpf_redirect flags don't overlap ... [ Upstream commit 09d88791c7 ] The bpf_redirect_info is shared between the SKB and XDP redirect paths, and the two paths use the same numeric flag values in the ri->flags field (specifically, BPF_F_BROADCAST == BPF_F_NEXTHOP). This means that if skb bpf_redirect_neigh() is used with a non-NULL params argument and, subsequently, an XDP redirect is performed using the same bpf_redirect_info struct, the XDP path will get confused and end up crashing, which syzbot managed to trigger. With the stack-allocated bpf_redirect_info, the structure is no longer shared between the SKB and XDP paths, so the crash doesn't happen anymore. However, different code paths using identically-numbered flag values in the same struct field still seems like a bit of a mess, so this patch cleans that up by moving the flag definitions together and redefining the three flags in BPF_F_REDIRECT_INTERNAL to not overlap with the flags used for XDP. It also adds a BUILD_BUG_ON() check to make sure the overlap is not re-introduced by mistake. Fixes: e624d4ed4a ("xdp: Extend xdp_redirect_map with broadcast support") Reported-by: syzbot+cca39e6e84a367a7e6f6@syzkaller.appspotmail.com Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Closes: https://syzkaller.appspot.com/bug?extid=cca39e6e84a367a7e6f6 Link: https://lore.kernel.org/bpf/20240920125625.59465-1-toke@redhat.com Signed-off-by: Sasha Levin <sashal@kernel.org>		History 2024-11-01 01:52:31 +01:00
..
asm-generic	syscalls: fix compat_sys_io_pgetevents_time64 usage	2024-07-05 09:14:50 +02:00
drm	drm/fourcc: Add packed 10bit YUV 4:2:0 format	2022-12-31 13:14:10 +01:00
linux	bpf: Make sure internal and UAPI bpf_redirect flags don't overlap	2024-11-01 01:52:31 +01:00
misc	habanalabs: fix resetting args in wait for CS IOCTL	2021-09-29 12:18:48 +03:00
mtd	mtd: add OTP (one-time-programmable) erase ioctl	2021-03-28 19:24:54 +02:00
rdma	RDMA/mlx5: Don't compare mkey tags in DEVX indirect mkey	2022-10-26 12:35:03 +02:00
scsi	scsi: fc: Add EDC ELS definition	2021-08-24 22:56:33 -04:00
sound	ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg	2023-05-30 13:55:33 +01:00
video	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
xen	xen/gntdev: gntdev.h: drop a duplicated word	2020-08-03 07:46:42 +02:00
Kbuild	kbuild: re-implement Makefile.headersinst without recursion	2019-06-15 19:57:02 +09:00