]> www.infradead.org Git - users/jedix/linux-maple.git/commit
bpf: Fix may_goto with negative offset.
authorAlexei Starovoitov <ast@kernel.org>
Wed, 19 Jun 2024 23:53:54 +0000 (16:53 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 24 Jun 2024 11:44:02 +0000 (13:44 +0200)
commit2b2efe1937ca9f8815884bd4dcd5b32733025103
treea48009516a3d43671f0380601a016fef79acb9c6
parent316930d06b92a2419d8e767193266e678545b31d
bpf: Fix may_goto with negative offset.

Zac's syzbot crafted a bpf prog that exposed two bugs in may_goto.
The 1st bug is the way may_goto is patched. When offset is negative
it should be patched differently.
The 2nd bug is in the verifier:
when current state may_goto_depth is equal to visited state may_goto_depth
it means there is an actual infinite loop. It's not correct to prune
exploration of the program at this point.
Note, that this check doesn't limit the program to only one may_goto insn,
since 2nd and any further may_goto will increment may_goto_depth only
in the queued state pushed for future exploration. The current state
will have may_goto_depth == 0 regardless of number of may_goto insns
and the verifier has to explore the program until bpf_exit.

Fixes: 011832b97b31 ("bpf: Introduce may_goto instruction")
Reported-by: Zac Ecob <zacecob@protonmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Closes: https://lore.kernel.org/bpf/CAADnVQL-15aNp04-cyHRn47Yv61NXfYyhopyZtUyxNojUZUXpA@mail.gmail.com/
Link: https://lore.kernel.org/bpf/20240619235355.85031-1-alexei.starovoitov@gmail.com
kernel/bpf/verifier.c