]> www.infradead.org Git - users/dwmw2/linux.git/commit
bpf, test_run: Fix LIVE_FRAME frame update after a page has been recycled
authorToke Høiland-Jørgensen <toke@redhat.com>
Wed, 30 Oct 2024 10:48:26 +0000 (11:48 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 31 Oct 2024 15:15:21 +0000 (16:15 +0100)
commitc40dd8c4732551605712985bc5b7045094c6458d
tree3e4325ec9143b9a62717f0c092f756d7fc1a4c12
parent053b212b3a356e47fe7772fbf19e07721393ba72
bpf, test_run: Fix LIVE_FRAME frame update after a page has been recycled

The test_run code detects whether a page has been modified and
re-initialises the xdp_frame structure if it has, using
xdp_update_frame_from_buff(). However, xdp_update_frame_from_buff()
doesn't touch frame->mem, so that wasn't correctly re-initialised, which
led to the pages from page_pool not being returned correctly. Syzbot
noticed this as a memory leak.

Fix this by also copying the frame->mem structure when re-initialising
the frame, like we do on initialisation of a new page from page_pool.

Fixes: e5995bc7e2ba ("bpf, test_run: fix crashes due to XDP frame overwriting/corruption")
Fixes: b530e9e1063e ("bpf: Add "live packet" mode for XDP in BPF_PROG_RUN")
Reported-by: syzbot+d121e098da06af416d23@syzkaller.appspotmail.com
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: syzbot+d121e098da06af416d23@syzkaller.appspotmail.com
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://lore.kernel.org/bpf/20241030-test-run-mem-fix-v1-1-41e88e8cae43@redhat.com
net/bpf/test_run.c