Commit 45ce4b4
bpf: Fix crash due to out of bounds access into reg2btf_ids.
When commit e6ac245 ("bpf: Support bpf program calling kernel function") added
kfunc support, it defined reg2btf_ids as a cheap way to translate the verifier
reg type to the appropriate btf_vmlinux BTF ID, however
commit c25b2ae ("bpf: Replace PTR_TO_XXX_OR_NULL with PTR_TO_XXX | PTR_MAYBE_NULL")
moved the __BPF_REG_TYPE_MAX from the last member of bpf_reg_type enum to after
the base register types, and defined other variants using type flag
composition. However, now, the direct usage of reg->type to index into
reg2btf_ids may no longer fall into __BPF_REG_TYPE_MAX range, and hence lead to
out of bounds access and kernel crash on dereference of bad pointer.
Fixes: c25b2ae ("bpf: Replace PTR_TO_XXX_OR_NULL with PTR_TO_XXX | PTR_MAYBE_NULL")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220216201943.624869-1-memxor@gmail.com1 parent 61d06f0 commit 45ce4b4
1 file changed
+3
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5688 | 5688 | | |
5689 | 5689 | | |
5690 | 5690 | | |
5691 | | - | |
| 5691 | + | |
| 5692 | + | |
5692 | 5693 | | |
5693 | 5694 | | |
5694 | 5695 | | |
| |||
5706 | 5707 | | |
5707 | 5708 | | |
5708 | 5709 | | |
5709 | | - | |
| 5710 | + | |
5710 | 5711 | | |
5711 | 5712 | | |
5712 | 5713 | | |
| |||
0 commit comments