Skip to content

Commit 5fe6e30

Browse files
oleg-nesterovPeter Zijlstra
authored andcommitted
bpf: Fix use-after-free in bpf_uprobe_multi_link_attach()
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/[email protected]/ Reported-by: [email protected] Signed-off-by: Oleg Nesterov <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Acked-by: Jiri Olsa <[email protected]> Tested-by: [email protected] Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 62c0b10 commit 5fe6e30

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

kernel/trace/bpf_trace.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3484,17 +3484,20 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
34843484
&uprobes[i].consumer);
34853485
if (IS_ERR(uprobes[i].uprobe)) {
34863486
err = PTR_ERR(uprobes[i].uprobe);
3487-
bpf_uprobe_unregister(uprobes, i);
3488-
goto error_free;
3487+
link->cnt = i;
3488+
goto error_unregister;
34893489
}
34903490
}
34913491

34923492
err = bpf_link_prime(&link->link, &link_primer);
34933493
if (err)
3494-
goto error_free;
3494+
goto error_unregister;
34953495

34963496
return bpf_link_settle(&link_primer);
34973497

3498+
error_unregister:
3499+
bpf_uprobe_unregister(uprobes, link->cnt);
3500+
34983501
error_free:
34993502
kvfree(uprobes);
35003503
kfree(link);

0 commit comments

Comments
 (0)