diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2021-11-01 15:21:52 -0700 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2021-11-01 18:05:12 -0700 |
| commit | 388e2c0b978339dee9b0a81a2e546f8979e021e2 (patch) | |
| tree | 65f18b9cf0e16c46fd448daa4f17c7ba460ae0b9 /kernel/bpf | |
| parent | bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off. (diff) | |
| download | linux-dev-388e2c0b978339dee9b0a81a2e546f8979e021e2.tar.xz linux-dev-388e2c0b978339dee9b0a81a2e546f8979e021e2.zip | |
bpf: Fix propagation of signed bounds from 64-bit min/max into 32-bit.
Similar to unsigned bounds propagation fix signed bounds.
The 'Fixes' tag is a hint. There is no security bug here.
The verifier was too conservative.
Fixes: 3f50f132d840 ("bpf: Verifier, do explicit ALU32 bounds tracking")
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20211101222153.78759-2-alexei.starovoitov@gmail.com
Diffstat (limited to 'kernel/bpf')
| -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 29671ed49ee8..a4b48bd4e3ca 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1420,7 +1420,7 @@ static void __reg_combine_32_into_64(struct bpf_reg_state *reg) static bool __reg64_bound_s32(s64 a) { - return a > S32_MIN && a < S32_MAX; + return a >= S32_MIN && a <= S32_MAX; } static bool __reg64_bound_u32(u64 a) |