bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off.
authorAlexei Starovoitov <ast@kernel.org>
Mon, 1 Nov 2021 22:21:51 +0000 (15:21 -0700)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 2 Nov 2021 01:05:11 +0000 (18:05 -0700)
commitb9979db8340154526d9ab38a1883d6f6ba9b6d47
tree41177055a06e0ac1de0edaab7b2cc3cec8cb2864
parenta20eac0af02810669e187cb623bc904908c423af
bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off.

Before this fix:
166: (b5) if r2 <= 0x1 goto pc+22
from 166 to 189: R2=invP(id=1,umax_value=1,var_off=(0x0; 0xffffffff))

After this fix:
166: (b5) if r2 <= 0x1 goto pc+22
from 166 to 189: R2=invP(id=1,umax_value=1,var_off=(0x0; 0x1))

While processing BPF_JLE the reg_set_min_max() would set true_reg->umax_value = 1
and call __reg_combine_64_into_32(true_reg).

Without the fix it would not pass the condition:
if (__reg64_bound_u32(reg->umin_value) && __reg64_bound_u32(reg->umax_value))

since umin_value == 0 at this point.
Before commit 10bf4e83167c the umin was incorrectly ingored.
The commit 10bf4e83167c fixed the correctness issue, but pessimized
propagation of 64-bit min max into 32-bit min max and corresponding var_off.

Fixes: 10bf4e83167c ("bpf: Fix propagation of 32 bit unsigned bounds from 64 bit bounds")
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-1-alexei.starovoitov@gmail.com
kernel/bpf/verifier.c
tools/testing/selftests/bpf/verifier/array_access.c