xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: Fix slot type check in check_stack_write_var_off

Browse Source 
[ Upstream commit f5e477a861e4a20d8a1c5f7a245f3a3c3c376b03 ]

For the case where allow_ptr_leaks is false, code is checking whether
slot type is STACK_INVALID and STACK_SPILL and rejecting other cases.
This is a consequence of incorrectly checking for register type instead
of the slot type (NOT_INIT and SCALAR_VALUE respectively). Fix the
check.

Fixes: 01f810ace9ed ("bpf: Allow variable-offset stack access")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20221103191013.1236066-5-memxor@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kumar Kartikeya Dwivedi
2022-11-04 00:39:53 +05:30
committed by Greg Kroah-Hartman
parent d959ff7fa9
commit 72e8d9c731
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/bpf/verifier.c
View File

@@ -2439,14 +2439,17 @@ static int check_stack_write_var_off(struct bpf_verifier_env *env,
spi = slot / BPF_REG_SIZE; spi = slot / BPF_REG_SIZE;
stype = &state->stack[spi].slot_type[slot % BPF_REG_SIZE]; stype = &state->stack[spi].slot_type[slot % BPF_REG_SIZE];
if (!env->allow_ptr_leaks if (!env->allow_ptr_leaks && *stype != STACK_MISC && *stype != STACK_ZERO) {
&& *stype != NOT_INIT /* Reject the write if range we may write to has not
&& *stype != SCALAR_VALUE) { * been initialized beforehand. If we didn't reject
/* Reject the write if there's are spilled pointers in * here, the ptr status would be erased below (even
* range. If we didn't reject here, the ptr status * though not all slots are actually overwritten),
* would be erased below (even though not all slots are * possibly opening the door to leaks.
* actually overwritten), possibly opening the door to *
* leaks. * We do however catch STACK_INVALID case below, and
* only allow reading possibly uninitialized memory
* later for CAP_PERFMON, as the write may not happen to
* that slot.
*/ */
verbose(env, "spilled ptr in range of var-offset stack write; insn %d, ptr off: %d", verbose(env, "spilled ptr in range of var-offset stack write; insn %d, ptr off: %d",
insn_idx, i); insn_idx, i);