diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2023-08-30 10:04:05 +0200 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2023-09-06 10:44:28 +0200 |
commit | 6764e767f4af1e35f87f3497e1182d945de37f93 (patch) | |
tree | 74f0a19f08a3904a3d898136382416fcfbee0f7d /kernel/rseq.c | |
parent | bpf: Invoke __bpf_prog_exit_sleepable_recur() on recursion in kern_sys_bpf(). (diff) | |
download | linux-6764e767f4af1e35f87f3497e1182d945de37f93.tar.xz linux-6764e767f4af1e35f87f3497e1182d945de37f93.zip |
bpf: Assign bpf_tramp_run_ctx::saved_run_ctx before recursion check.
__bpf_prog_enter_recur() assigns bpf_tramp_run_ctx::saved_run_ctx before
performing the recursion check which means in case of a recursion
__bpf_prog_exit_recur() uses the previously set bpf_tramp_run_ctx::saved_run_ctx
value.
__bpf_prog_enter_sleepable_recur() assigns bpf_tramp_run_ctx::saved_run_ctx
after the recursion check which means in case of a recursion
__bpf_prog_exit_sleepable_recur() uses an uninitialized value. This does not
look right. If I read the entry trampoline code right, then bpf_tramp_run_ctx
isn't initialized upfront.
Align __bpf_prog_enter_sleepable_recur() with __bpf_prog_enter_recur() and
set bpf_tramp_run_ctx::saved_run_ctx before the recursion check is made.
Remove the assignment of saved_run_ctx in kern_sys_bpf() since it happens
a few cycles later.
Fixes: e384c7b7b46d0 ("bpf, x86: Create bpf_tramp_run_ctx on the caller thread's stack")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/bpf/20230830080405.251926-3-bigeasy@linutronix.de
Diffstat (limited to 'kernel/rseq.c')
0 files changed, 0 insertions, 0 deletions