Skip to content

Commit 4d0a375

Browse files
mykyta5Alexei Starovoitov
authored andcommitted
bpf: Fix NULL deref in map_kptr_match_type for scalar regs
Commit ab6c637 ("bpf: Fix a bpf_kptr_xchg() issue with local kptr") refactored map_kptr_match_type() to branch on btf_is_kernel() before checking base_type(). A scalar register stored into a kptr slot has no btf, so the btf_is_kernel(reg->btf) call dereferences NULL. Move the base_type() != PTR_TO_BTF_ID guard before any reg->btf access. Fixes: ab6c637 ("bpf: Fix a bpf_kptr_xchg() issue with local kptr") Reported-by: Hiker Cl <clhiker365@gmail.com> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=221372 Signed-off-by: Mykyta Yatsenko <yatsenko@meta.com> Acked-by: Paul Chaignon <paul.chaignon@gmail.com> Link: https://lore.kernel.org/r/20260416-kptr_crash-v1-1-5589356584b4@meta.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent e5f635e commit 4d0a375

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

kernel/bpf/verifier.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4549,6 +4549,9 @@ static int map_kptr_match_type(struct bpf_verifier_env *env,
45494549
int perm_flags;
45504550
const char *reg_name = "";
45514551

4552+
if (base_type(reg->type) != PTR_TO_BTF_ID)
4553+
goto bad_type;
4554+
45524555
if (btf_is_kernel(reg->btf)) {
45534556
perm_flags = PTR_MAYBE_NULL | PTR_TRUSTED | MEM_RCU;
45544557

@@ -4561,7 +4564,7 @@ static int map_kptr_match_type(struct bpf_verifier_env *env,
45614564
perm_flags |= MEM_PERCPU;
45624565
}
45634566

4564-
if (base_type(reg->type) != PTR_TO_BTF_ID || (type_flag(reg->type) & ~perm_flags))
4567+
if (type_flag(reg->type) & ~perm_flags)
45654568
goto bad_type;
45664569

45674570
/* We need to verify reg->type and reg->btf, before accessing reg->btf */

0 commit comments

Comments
 (0)