Commit 4d0a375
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4549 | 4549 | | |
4550 | 4550 | | |
4551 | 4551 | | |
| 4552 | + | |
| 4553 | + | |
| 4554 | + | |
4552 | 4555 | | |
4553 | 4556 | | |
4554 | 4557 | | |
| |||
4561 | 4564 | | |
4562 | 4565 | | |
4563 | 4566 | | |
4564 | | - | |
| 4567 | + | |
4565 | 4568 | | |
4566 | 4569 | | |
4567 | 4570 | | |
| |||
0 commit comments