bpf: Fix trampoline image UAF on multi detach failure
Subsystems (5)
v5 cover bpf: Fix trampoline image UAF on multi detach failure
From: Hui Zhu <[email protected]>
This series fixes a UAF in bpf_trampoline_multi_attach_free() where old_image is freed while ftrace still calls into it, and makes bpf_trampoline_multi_detach() return void as suggested by Jiri Olsa.
Patch 1 fixes the UAF. Patch 2 is an independent cleanup that changes the return type to void and drops the WARN_ON_ONCE at the call site.
Changelog:
v5:
According to the comments of bot+bpf-ci, split the single patch into
two: the bug fix and the return-type cleanup.
v4:
According to the comments of bot+bpf-ci, add Fixes: and update comments of bpf_trampoline_multi_attach_free.
v3:
According to the comments of Jiri Olsa, drop patches 2/3 and the prog-side machinery.
keep only the simplified image-side fix in bpf_trampoline_multi_attach_free() and make bpf_trampoline_multi_detach() return void.
v2:
Folded v1's two detach patches into patch 1.
According to the comments of Jiri Olsa, Pin the prog (pinned_prog) on cur_image so it stays alive while ftrace may still call into it. Make bpf_trampoline_multi_detach() return void.
Fix the same UAF in standard (non-multi) trampolines. According to the comments of sashiko, Fix the prog UAF in bpf_trampoline_multi_attach() rollback.
Leak the trampoline in bpf_trampoline_put() when cur_image is left by a rollback.
Hui Zhu (2):
bpf: Fix UAF in bpf_trampoline_multi_attach_free on update failure
bpf: Make bpf_trampoline_multi_detach return void
include/linux/bpf.h | 9 ++++----- kernel/bpf/trampoline.c | 16 +++++++++++++--- kernel/trace/bpf_trace.c | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-)
Signature · 1 line
2.53.0
PATCH v5 1/2 bpf: Fix UAF in bpf_trampoline_multi_attach_free on update failure
From: Hui Zhu <[email protected]>
When bpf_trampoline_update() fails before modify_fentry_multi()/ unregister_fentry_multi() is called, cur_image is unchanged (cur_image == old_image) and ftrace still calls into it. Freeing old_image in that case causes a UAF.
Only free old_image when it differs from cur_image.
--- kernel/bpf/trampoline.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
kernel/bpf/trampoline.c +11 -1
@@ -1595,7 +1595,17 @@ static void bpf_trampoline_multi_attach_init(struct bpf_trampoline *tr)static void bpf_trampoline_multi_attach_free (struct bpf_trampoline *tr) { -if (tr->multi_attach.old_image) +/* +* Only free old_image if it is no longer the active image. +* When bpf_trampoline_update() fails before modify_fentry_multi()/ +* unregister_fentry_multi() is called, cur_image is unchanged +* (cur_image == old_image) and ftrace still points to it. Freeing +* it would cause a UAF when ftrace calls into the freed memory. +* On success, cur_image is either a new image or NULL, so +* old_image != cur_image means the image is stale. +*/ +if (tr->multi_attach.old_image && + tr->multi_attach.old_image != tr->cur_image)bpf_tramp_image_put (tr->multi_attach.old_image); tr->multi_attach.old_image =NULL ;
Signature · 1 line
2.53.0
PATCH v5 2/2 bpf: Make bpf_trampoline_multi_detach return void
In reply to Hui ZhuFrom: Hui Zhu <[email protected]>
bpf_trampoline_multi_detach() always returns 0 and the sole caller ignores the return value. Change it to return void and drop the WARN_ON_ONCE at the call site.
--- include/linux/bpf.h | 9 ++++----- kernel/bpf/trampoline.c | 4 ++-- kernel/trace/bpf_trace.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-)
include/linux/bpf.h +4 -5
@@ -1518,8 +1518,8 @@ int arch_prepare_bpf_dispatcher(void *image, void *buf, s64 *funcs, int num_funcint bpf_trampoline_multi_attach (struct bpf_prog *prog,u32 *ids,struct bpf_tracing_multi_link *link); -int bpf_trampoline_multi_detach (struct bpf_prog *prog, -struct bpf_tracing_multi_link *link); +void bpf_trampoline_multi_detach (struct bpf_prog *prog, +struct bpf_tracing_multi_link *link);void bpf_trampoline_set_flags (struct bpf_trampoline *tr,u32 flags);/*
@@ -1639,10 +1639,9 @@ static inline int bpf_trampoline_multi_attach(struct bpf_prog *prog, u32 *ids, {return -ENOTSUPP ; } -static inline int bpf_trampoline_multi_detach (struct bpf_prog *prog, -struct bpf_tracing_multi_link *link) +static inline void bpf_trampoline_multi_detach (struct bpf_prog *prog, +struct bpf_tracing_multi_link *link) { -return -ENOTSUPP ; }static inline void bpf_trampoline_set_flags (struct bpf_trampoline *tr,u32 flags) {}#endif
kernel/bpf/trampoline.c +2 -2
@@ -1729,7 +1729,8 @@ int bpf_trampoline_multi_attach(struct bpf_prog *prog, u32 *ids,return err; } -int bpf_trampoline_multi_detach (struct bpf_prog *prog,struct bpf_tracing_multi_link *link) +void bpf_trampoline_multi_detach (struct bpf_prog *prog, +struct bpf_tracing_multi_link *link) {struct bpf_tracing_multi_data *data = &link->data;struct bpf_tracing_multi_node *mnode;
@@ -1759,7 +1760,6 @@ int bpf_trampoline_multi_detach(struct bpf_prog *prog, struct bpf_tracing_multi_bpf_trampoline_put (mnode->trampoline);clear_tracing_multi_data (data); -return 0 ; }#undef for_each_mnode_cnt
kernel/trace/bpf_trace.c +1 -1
@@ -3687,7 +3687,7 @@ static void bpf_tracing_multi_link_release(struct bpf_link *link)struct bpf_tracing_multi_link *tr_link = container_of(link, struct bpf_tracing_multi_link, link); -WARN_ON_ONCE (bpf_trampoline_multi_detach (link->prog, tr_link)); +bpf_trampoline_multi_detach (link->prog, tr_link); }static void bpf_tracing_multi_link_dealloc (struct bpf_link *link)
Signature · 1 line
2.53.0
Quoted 9 lines · Hui Zhu
From: Hui Zhu <[email protected]>
This series fixes a UAF in
bpf_trampoline_multi_attach_free()whereold_imageis freed while ftrace still calls into it, and makesbpf_trampoline_multi_detach()return void as suggested by Jiri Olsa.Patch 1 fixes the UAF. Patch 2 is an independent cleanup that changes the return type to void and drops the
WARN_ON_ONCEat the call site.
The UAF issue was reported by Sashiko when reviewing "bpf: Add tracing_multi link support for bpf progs" [1].
The fix and the cleanup look good to me.
[1]
https://sashiko.dev/#/message/20260809153308.5331D1F000E9%40smtp.kernel.org
Quoted 1 line
[...]
Quoted 34 lines · Hui Zhu
From: Hui Zhu <[email protected]>
This series fixes a UAF in
bpf_trampoline_multi_attach_free()whereold_imageis freed while ftrace still calls into it, and makesbpf_trampoline_multi_detach()return void as suggested by Jiri Olsa.Patch 1 fixes the UAF. Patch 2 is an independent cleanup that changes the return type to void and drops the
WARN_ON_ONCEat the call site.Changelog:
v5:
According to the comments of bot+bpf-ci, split the single patch into
two: the bug fix and the return-type cleanup.
v4:
According to the comments of bot+bpf-ci, add Fixes: and update comments ofbpf_trampoline_multi_attach_free.
v3:
According to the comments of Jiri Olsa, drop patches 2/3 and the prog-side machinery.
keep only the simplified image-side fix inbpf_trampoline_multi_attach_free()and makebpf_trampoline_multi_detach()return void.
v2:
Folded v1's two detach patches into patch 1.
According to the comments of Jiri Olsa, Pin the prog (pinned_prog) oncur_imageso it stays alive while ftrace may still call into it. Makebpf_trampoline_multi_detach()return void.
Fix the same UAF in standard (non-multi) trampolines. According to the comments of sashiko, Fix the prog UAF inbpf_trampoline_multi_attach()rollback.
Leak the trampoline inbpf_trampoline_put()whencur_imageis left by a rollback.
Quoted 3 lines
Hui Zhu (2):
bpf: Fix UAF inbpf_trampoline_multi_attach_freeon update failure
bpf: Makebpf_trampoline_multi_detachreturn void
thanks,
jirka
Quoted 25 lines · Hui Zhu
From: Hui Zhu <[email protected]>
This series fixes a UAF in
bpf_trampoline_multi_attach_free()whereold_imageis freed while ftrace still calls into it, and makesbpf_trampoline_multi_detach()return void as suggested by Jiri Olsa.Patch 1 fixes the UAF. Patch 2 is an independent cleanup that changes the return type to void and drops the
WARN_ON_ONCEat the call site.Changelog:
v5:
According to the comments of bot+bpf-ci, split the single patch into
two: the bug fix and the return-type cleanup.
v4:
According to the comments of bot+bpf-ci, add Fixes: and update comments ofbpf_trampoline_multi_attach_free.
v3:
According to the comments of Jiri Olsa, drop patches 2/3 and the prog-side machinery.
keep only the simplified image-side fix inbpf_trampoline_multi_attach_free()and makebpf_trampoline_multi_detach()return void.
v2:
Folded v1's two detach patches into patch 1.
Quoted 9 lines
According to the comments of Jiri Olsa, Pin the prog (
pinned_prog) oncur_imageso it stays alive while ftrace may still call into it. Makebpf_trampoline_multi_detach()return void.
Fix the same UAF in standard (non-multi) trampolines. According to the comments of sashiko, Fix the prog UAF inbpf_trampoline_multi_attach()rollback.
Leak the trampoline inbpf_trampoline_put()whencur_imageis left by a rollback.
Applied, thanks.
Quoted 8 lines
Hui Zhu (2):
bpf: Fix UAF inbpf_trampoline_multi_attach_freeon update failure
bpf: Makebpf_trampoline_multi_detachreturn voidinclude/linux/bpf.h | 9 ++++----- kernel/bpf/trampoline.c | 16 +++++++++++++--- kernel/trace/bpf_trace.c | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-)