bpf: Fix potential array overflow in bpf_trampoline_get_progs()
Subsystems (4)
PATCH 1/1 bpf: Fix potential array overflow in bpf_trampoline_get_progs()
The cnt value in the 'cnt >= BPF_MAX_TRAMP_PROGS' check does not include BPF_TRAMP_MODIFY_RETURN bpf programs, so the number of the attached BPF_TRAMP_MODIFY_RETURN bpf programs in a trampoline can exceed BPF_MAX_TRAMP_PROGS.
When this happens, the assignment '*progs++ = aux->prog' in bpf_trampoline_get_progs() will cause progs array overflow as the progs field in the bpf_tramp_progs struct can only hold at most BPF_MAX_TRAMP_PROGS bpf programs.
--- kernel/bpf/trampoline.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
kernel/bpf/trampoline.c +12 -6
@@ -411,7 +411,7 @@ int bpf_trampoline_link_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) {enum bpf_tramp_prog_type kind;int err =0 ; -int cnt; +int cnt =0 , i; kind =bpf_attach_type_to_tramp (prog);mutex_lock (&tr->mutex);
@@ -422,7 +422,10 @@ int bpf_trampoline_link_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) err = -EBUSY ; goto out; } - cnt = tr->progs_cnt[BPF_TRAMP_FENTRY ] + tr->progs_cnt[BPF_TRAMP_FEXIT ]; + +for (i =0 ; i <BPF_TRAMP_MAX ; i++) + cnt += tr->progs_cnt[i]; +if (kind ==BPF_TRAMP_REPLACE ) {/* Cannot attach extension if fentry/fexit are in use. */ if (cnt) {
@@ -500,16 +503,19 @@ struct bpf_trampoline *bpf_trampoline_get(u64 key,void bpf_trampoline_put (struct bpf_trampoline *tr) { +int i; +if (!tr)return ;mutex_lock (&trampoline_mutex);if (!refcount_dec_and_test (&tr->refcnt)) goto out;WARN_ON_ONCE (mutex_is_locked (&tr->mutex)); -if (WARN_ON_ONCE (!hlist_empty (&tr->progs_hlist[BPF_TRAMP_FENTRY ]))) - goto out; -if (WARN_ON_ONCE (!hlist_empty (&tr->progs_hlist[BPF_TRAMP_FEXIT ]))) - goto out; + +for (i =0 ; i <BPF_TRAMP_MAX ; i++) +if (WARN_ON_ONCE (!hlist_empty (&tr->progs_hlist[i]))) + goto out; +/* This code will be executed even when the last bpf_tramp_image * is alive. All progs are detached from the trampoline and the * trampoline image is patched with jmp into epilogue to skip
Signature · 1 line
2.36.0
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 11 lines · On Sat, 30 Apr 2022 21:08:03 +0800 you wrote:
The cnt value in the 'cnt >=
BPF_MAX_TRAMP_PROGS' check does not includeBPF_TRAMP_MODIFY_RETURNbpf programs, so the number of the attachedBPF_TRAMP_MODIFY_RETURNbpf programs in a trampoline can exceedBPF_MAX_TRAMP_PROGS.When this happens, the assignment '*progs++ =
aux->prog' inbpf_trampoline_get_progs()will cause progs array overflow as the progs field in thebpf_tramp_progsstruct can only hold at mostBPF_MAX_TRAMP_PROGSbpf programs.[...]
Here is the summary with links:
- [bpf-next] bpf: Fix potential array overflow in bpf_trampoline_get_progs()
https://git.kernel.org/bpf/bpf-next/c/a2aa95b71c9b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html