bpf: Check for NULL return from bpf_get_btf_vmlinux
Subsystems (2)
Kumar Kartikeya Dwivedi
maintainerPATCH 1/1 bpf: Check for NULL return from bpf_get_btf_vmlinux
When CONFIG_DEBUG_INFO_BTF is disabled, bpf_get_btf_vmlinux can return a NULL pointer. Check for it in btf_get_module_btf to prevent a NULL pointer dereference.
While kernel test robot only complained about this specific case, let's also check for NULL in other call sites of bpf_get_btf_vmlinux.
--- kernel/bpf/btf.c | 6 +++++- net/core/bpf_sk_storage.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-)
kernel/bpf/btf.c +5 -1
@@ -534,6 +534,8 @@ static s32 bpf_find_btf_id(const char *name, u32 kind, struct btf **btf_p) btf =bpf_get_btf_vmlinux ();if (IS_ERR (btf))return PTR_ERR (btf); +if (!btf) +return -EINVAL ; ret =btf_find_by_name_kind (btf, name, kind);/* ret is never zero, since btf_find_by_name_kind returns
@@ -6584,7 +6586,7 @@ static struct btf *btf_get_module_btf(const struct module *module)if (!module) { btf =bpf_get_btf_vmlinux (); -if (!IS_ERR (btf)) +if (!IS_ERR_OR_NULL (btf))btf_get (btf);return btf; }
@@ -7180,6 +7182,8 @@ bpf_core_find_cands(struct bpf_core_ctx *ctx, u32 local_type_id) main_btf =bpf_get_btf_vmlinux ();if (IS_ERR (main_btf))return ERR_CAST (main_btf); +if (!main_btf) +return ERR_PTR (-EINVAL ); local_type =btf_type_by_id (local_btf, local_type_id);if (!local_type)
net/core/bpf_sk_storage.c +2 -0
@@ -405,6 +405,8 @@ static bool bpf_sk_storage_tracing_allowed(const struct bpf_prog *prog)case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT : btf_vmlinux =bpf_get_btf_vmlinux (); +if (IS_ERR_OR_NULL (btf_vmlinux)) +return false; btf_id = prog->aux->attach_btf_id; t =btf_type_by_id (btf_vmlinux, btf_id); tname =btf_name_by_offset (btf_vmlinux, t->name_off);
--
2.35.1
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Sun, 20 Mar 2022 20:00:03 +0530 you wrote:
When
CONFIG_DEBUG_INFO_BTFis disabled,bpf_get_btf_vmlinuxcan return a NULL pointer. Check for it inbtf_get_module_btfto prevent a NULL pointer dereference.While kernel test robot only complained about this specific case, let's also check for NULL in other call sites of
bpf_get_btf_vmlinux.[...]
Here is the summary with links:
- [bpf-next] bpf: Check for NULL return from bpf_get_btf_vmlinux
https://git.kernel.org/bpf/bpf-next/c/7ada3787e91c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html