]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
bpf: Sync pending IRQ work before freeing ring buffer
authorNoorain Eqbal <nooraineqbal@gmail.com>
Mon, 20 Oct 2025 18:03:01 +0000 (23:33 +0530)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 21 Oct 2025 16:57:48 +0000 (09:57 -0700)
Fix a race where irq_work can be queued in bpf_ringbuf_commit()
but the ring buffer is freed before the work executes.
In the syzbot reproducer, a BPF program attached to sched_switch
triggers bpf_ringbuf_commit(), queuing an irq_work. If the ring buffer
is freed before this work executes, the irq_work thread may accesses
freed memory.
Calling `irq_work_sync(&rb->work)` ensures that all pending irq_work
complete before freeing the buffer.

Fixes: 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support for it")
Reported-by: syzbot+2617fc732430968b45d2@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=2617fc732430968b45d2
Tested-by: syzbot+2617fc732430968b45d2@syzkaller.appspotmail.com
Signed-off-by: Noorain Eqbal <nooraineqbal@gmail.com>
Link: https://lore.kernel.org/r/20251020180301.103366-1-nooraineqbal@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/ringbuf.c

index 719d73299397b520c7b7412106a193840b337ed4..d706c4b7f532d4047fe9427845edb49e31b7a08f 100644 (file)
@@ -216,6 +216,8 @@ static struct bpf_map *ringbuf_map_alloc(union bpf_attr *attr)
 
 static void bpf_ringbuf_free(struct bpf_ringbuf *rb)
 {
+       irq_work_sync(&rb->work);
+
        /* copy pages pointer and nr_pages to local variable, as we are going
         * to unmap rb itself with vunmap() below
         */