diff options
| author | Shung-Hsi Yu <shung-hsi.yu@suse.com> | 2024-07-12 16:01:24 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-03 08:59:46 +0200 |
| commit | 345652866a8869825a2a582ee5a28d75141f184a (patch) | |
| tree | fba6bd121335fbe76fb9941e7e2c2978119f9c0d /kernel | |
| parent | fbb84b1b05c97b5363d916f4c8d1c2797c6f7da2 (diff) | |
| download | linux-345652866a8869825a2a582ee5a28d75141f184a.tar.gz linux-345652866a8869825a2a582ee5a28d75141f184a.tar.bz2 linux-345652866a8869825a2a582ee5a28d75141f184a.zip | |
bpf: fix overflow check in adjust_jmp_off()
[ Upstream commit 4a04b4f0de59dd5c621e78f15803ee0b0544eeb8 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index e1e08e62a2f2..6b422c275f78 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -18768,7 +18768,7 @@ static int adjust_jmp_off(struct bpf_prog *prog, u32 tgt_idx, u32 delta) } else { if (i + 1 + insn->off != tgt_idx) continue; - if (signed_add16_overflows(insn->imm, delta)) + if (signed_add16_overflows(insn->off, delta)) return -ERANGE; insn->off += delta; } |