]> www.infradead.org Git - users/dwmw2/linux.git/commit
bpf: fix overflow check in adjust_jmp_off()
authorShung-Hsi Yu <shung-hsi.yu@suse.com>
Fri, 12 Jul 2024 08:01:24 +0000 (16:01 +0800)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 12 Jul 2024 15:54:07 +0000 (08:54 -0700)
commit4a04b4f0de59dd5c621e78f15803ee0b0544eeb8
treea269c2797c6ab33dc8e4849d77bac21b943a23f3
parent2454075f8e2915cebbe52a1195631bc7efe2b7e1
bpf: fix overflow check in adjust_jmp_off()

adjust_jmp_off() incorrectly used the insn->imm field for all overflow check,
which is incorrect as that should only be done or the BPF_JMP32 | BPF_JA case,
not the general jump instruction case. Fix it by using insn->off for overflow
check in the general case.

Fixes: 5337ac4c9b80 ("bpf: Fix the corner case with may_goto and jump to the 1st insn.")
Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
Link: https://lore.kernel.org/r/20240712080127.136608-2-shung-hsi.yu@suse.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c