bpf: Disallow bpf_obj_new_impl call when bpf_mem_alloc_init fails
Kumar Kartikeya Dwivedi
maintainerPATCH 1/1 bpf: Disallow bpf_obj_new_impl call when bpf_mem_alloc_init fails
In the unlikely event that bpf_global_ma is not correctly initialized, instead of checking the boolean everytime bpf_obj_new_impl is called, simply check it while loading the program and return an error if bpf_global_ma_set is false.
--- kernel/bpf/helpers.c | 2 -- kernel/bpf/verifier.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-)
kernel/bpf/helpers.c +0 -2
@@ -1760,8 +1760,6 @@ void *bpf_obj_new_impl(u64 local_type_id__k, void *meta__ign)u64 size = local_type_id__k;void *p; -if (unlikely (!bpf_global_ma_set)) -return NULL ; p =bpf_mem_alloc (&bpf_global_ma, size);if (!p)return NULL ;
kernel/bpf/verifier.c +6 -0
@@ -8878,6 +8878,12 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,struct btf *ret_btf;u32 ret_btf_id; +/* Unlikely, but fail the kfunc call if bpf_global_ma +* is not initialized. +*/ +if (!bpf_global_ma_set) +return -ENOMEM ; +if (((u64 )(u32 )meta.arg_constant.value) != meta.arg_constant.value) {verbose (env,"local type ID argument must be in range [0, U32_MAX]\n" );return -EINVAL ;
--
2.38.1
Quoted 31 lines · Kumar Kartikeya Dwivedi
In the unlikely event that
bpf_global_mais not correctly initialized, instead of checking the boolean everytimebpf_obj_new_implis called, simply check it while loading the program and return an error ifbpf_global_ma_setis false.Suggested-by Alexei Starovoitov <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- kernel/bpf/helpers.c | 2 -- kernel/bpf/verifier.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-)kernel/bpf/helpers.c +0
-2@@ -1760,8 +1760,6 @@ void *bpf_obj_new_impl(u64 local_type_id__k, void *meta__ign)u64 size = local_type_id__k;void *p; -if (unlikely (!bpf_global_ma_set)) -return NULL ; p =bpf_mem_alloc (&bpf_global_ma, size);if (!p)return NULL ;kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, · line 8885
Quoted 8 lines
kernel/bpf/verifier.c +5
-0@@ -8878,6 +8878,12 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,struct btf *ret_btf;u32 ret_btf_id; +/* Unlikely, but fail the kfunc call if bpf_global_ma +* is not initialized. +*/ +if (!bpf_global_ma_set) +return -ENOMEM ;
I removed the comment and added unlikely().
Comments should describe things that are not obvious from C code.
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 9 lines · On Mon, 21 Nov 2022 02:56:10 +0530 you wrote:
In the unlikely event that
bpf_global_mais not correctly initialized, instead of checking the boolean everytimebpf_obj_new_implis called, simply check it while loading the program and return an error ifbpf_global_ma_setis false.Suggested-by Alexei Starovoitov <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>[...]
Here is the summary with links:
- [bpf-next] bpf: Disallow bpf_obj_new_impl call when bpf_mem_alloc_init fails
https://git.kernel.org/bpf/bpf-next/c/e181d3f143f7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html