Fix crash due to OOB access when reg->type > __BPF_REG_TYPE_MAX
Kumar Kartikeya Dwivedi
maintainerPATCH v2 1/1 Fix crash due to OOB access when reg->type > __BPF_REG_TYPE_MAX
When commit e6ac2450d6de ("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 c25b2ae13603 ("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.
--
v1 -> v2
- Use base_type(reg->type) && !type_flag(reg->type) (Alexei)
--- kernel/bpf/btf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/btf.c +3 -2
@@ -5688,7 +5688,8 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env, }if (check_ptr_off_reg (env, reg, regno))return -EINVAL ; - }else if (is_kfunc && (reg->type ==PTR_TO_BTF_ID || reg2btf_ids[reg->type])) { + }else if (is_kfunc && (reg->type ==PTR_TO_BTF_ID || + (reg2btf_ids[base_type (reg->type)] && !type_flag (reg->type)))) {const struct btf_type *reg_ref_t;const struct btf *reg_btf;const char *reg_ref_tname;
@@ -5706,7 +5707,7 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env, reg_ref_id = reg->btf_id; }else { reg_btf = btf_vmlinux; - reg_ref_id = *reg2btf_ids[reg->type]; + reg_ref_id = *reg2btf_ids[base_type (reg->type)]; } reg_ref_t = btf_type_skip_modifiers(reg_btf, reg_ref_id,
--
2.35.1
Quoted 6 lines · Kumar Kartikeya Dwivedi
When commit
e6ac2450d6de("bpf: Support bpf program calling kernel function") added kfunc support, it definedreg2btf_idsas a cheap way to translate the verifier reg type to the appropriatebtf_vmlinuxBTF ID, however commitc25b2ae13603("bpf: ReplacePTR_TO_XXX_OR_NULLwithPTR_TO_XXX|PTR_MAYBE_NULL") moved the__BPF_REG_TYPE_MAXfrom the last
The commit description shouldn't be wrapped into multiline. The subj also missed the "bpf:" prefix.
I fixed that and pushed to bpf tree.
Thanks!
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 11 lines · On Thu, 17 Feb 2022 01:49:43 +0530 you wrote:
When commit
e6ac2450d6de("bpf: Support bpf program calling kernel function") added kfunc support, it definedreg2btf_idsas a cheap way to translate the verifier reg type to the appropriatebtf_vmlinuxBTF ID, however commitc25b2ae13603("bpf: ReplacePTR_TO_XXX_OR_NULLwithPTR_TO_XXX|PTR_MAYBE_NULL") moved the__BPF_REG_TYPE_MAXfrom the last member ofbpf_reg_typeenum to after the base register types, and defined other variants using type flag composition. However, now, the direct usage ofreg->typeto index intoreg2btf_idsmay no longer fall into__BPF_REG_TYPE_MAXrange, and hence lead to out of bounds access and kernel crash on dereference of bad pointer.
Quoted 1 line
[...]
Here is the summary with links:
- [bpf,v2] Fix crash due to OOB access when reg->type > __BPF_REG_TYPE_MAX
https://git.kernel.org/bpf/bpf/c/45ce4b4f9009
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html