Skip to content

Commit cdf2783

Browse files
oleg-nesterovgregkh
authored andcommitted
bpf: Fix use-after-free in bpf_uprobe_multi_link_attach()
commit 5fe6e30 upstream. If bpf_link_prime() fails, bpf_uprobe_multi_link_attach() goes to the error_free label and frees the array of bpf_uprobe's without calling bpf_uprobe_unregister(). This leaks bpf_uprobe->uprobe and worse, this frees bpf_uprobe->consumer without removing it from the uprobe->consumers list. Fixes: 89ae89f ("bpf: Add multi uprobe link") Closes: https://lore.kernel.org/all/000000000000382d39061f59f2dd@google.com/ Reported-by: syzbot+f7a1c2c2711e4a780f19@syzkaller.appspotmail.com Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Jiri Olsa <jolsa@kernel.org> Tested-by: syzbot+f7a1c2c2711e4a780f19@syzkaller.appspotmail.com Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240813152524.GA7292@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6e0014d commit cdf2783

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

kernel/trace/bpf_trace.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3487,17 +3487,20 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
34873487
uprobes[i].ref_ctr_offset,
34883488
&uprobes[i].consumer);
34893489
if (err) {
3490-
bpf_uprobe_unregister(&path, uprobes, i);
3491-
goto error_free;
3490+
link->cnt = i;
3491+
goto error_unregister;
34923492
}
34933493
}
34943494

34953495
err = bpf_link_prime(&link->link, &link_primer);
34963496
if (err)
3497-
goto error_free;
3497+
goto error_unregister;
34983498

34993499
return bpf_link_settle(&link_primer);
35003500

3501+
error_unregister:
3502+
bpf_uprobe_unregister(&path, uprobes, link->cnt);
3503+
35013504
error_free:
35023505
kvfree(uprobes);
35033506
kfree(link);

0 commit comments

Comments
 (0)