bpf: Fix a bpf_kptr_xchg() issue with local kptr
Subsystems (4)
Yonghong Song
reviewerPATCH v2 1/2 bpf: Fix a bpf_kptr_xchg() issue with local kptr
When reviewing local percpu kptr support, Alexei discovered a bug wherea bpf_kptr_xchg() may succeed even if the map value kptr type and locally allocated obj type do not match ([1]). Missed struct btf_id comparison is the reason for the bug. This patch added such struct btf_id comparison and will flag verification failure if types do not match.
[1] https://lore.kernel.org/bpf/20230819002907.io3iphmnuk43xblu@macbook-pro-8.dhcp.thefacebook.com/#t
--- kernel/bpf/verifier.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
Changelogs:
v1 -> v2:
- call map_kptr_match_type() instead of btf_struct_ids_match().
kernel/bpf/verifier.c +15 -10
@@ -4990,20 +4990,22 @@ static int map_kptr_match_type(struct bpf_verifier_env *env, struct bpf_reg_state *reg, u32 regno) {const char *targ_name =btf_type_name (kptr_field->kptr.btf, kptr_field->kptr.btf_id); -int perm_flags =PTR_MAYBE_NULL |PTR_TRUSTED |MEM_RCU ; +int perm_flags;const char *reg_name ="" ; -/* Only unreferenced case accepts untrusted pointers */ -if (kptr_field->type ==BPF_KPTR_UNREF ) - perm_flags |=PTR_UNTRUSTED ; +if (btf_is_kernel (reg->btf)) { + perm_flags =PTR_MAYBE_NULL |PTR_TRUSTED |MEM_RCU ; + +/* Only unreferenced case accepts untrusted pointers */ +if (kptr_field->type ==BPF_KPTR_UNREF ) + perm_flags |=PTR_UNTRUSTED ; + }else { + perm_flags =PTR_MAYBE_NULL |MEM_ALLOC ; + }if (base_type (reg->type) !=PTR_TO_BTF_ID || (type_flag (reg->type) & ~perm_flags)) goto bad_type; -if (!btf_is_kernel (reg->btf)) { -verbose (env,"R%d must point to kernel BTF\n" , regno); -return -EINVAL ; - }/* We need to verify reg->type and reg->btf, before accessing reg->btf */ reg_name =btf_type_name (reg->btf, reg->btf_id);
@@ -5016,7 +5018,7 @@ static int map_kptr_match_type(struct bpf_verifier_env *env,if (__check_ptr_off_reg (env, reg, regno, true))return -EACCES ; -/* A full type match is needed, as BTF can be vmlinux or module BTF, and +/* A full type match is needed, as BTF can be vmlinux, module or prog BTF, and * we also need to take into account the reg->off. * * We want to support cases like:
@@ -7916,7 +7918,10 @@ static int check_reg_type(struct bpf_verifier_env *env, u32 regno,verbose (env,"verifier internal error: unimplemented handling of MEM_ALLOC\n" );return -EFAULT ; } -/* Handled by helper specific checks */ +if (meta->func_id == BPF_FUNC_kptr_xchg) { +if (map_kptr_match_type (env, meta->kptr_field, reg, regno)) +return -EACCES ; + }break ;case PTR_TO_BTF_ID |MEM_PERCPU :case PTR_TO_BTF_ID |MEM_PERCPU |PTR_TRUSTED :
Signature · 1 line
2.34.1
Yonghong Song
reviewerPATCH v2 2/2 selftests/bpf: Add a failure test for bpf_kptr_xchg() with local kptr
For a bpf_kptr_xchg() with local kptr, if the map value kptr type and allocated local obj type does not match, with the previous patch, the below verifier error message will be logged:
R2 is of type <allocated local obj type> but <map value kptr type> is expected
Without the previous patch, the test will have unexpected success.
--- .../bpf/prog_tests/local_kptr_stash.c | 10 ++- .../bpf/progs/local_kptr_stash_fail.c | 65 +++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/local_kptr_stash_fail.c
tools/testing/selftests/bpf/prog_tests/local_kptr_stash.c +9 -1
@@ -5,6 +5,7 @@#include <network_helpers.h> #include "local_kptr_stash.skel.h" +#include "local_kptr_stash_fail.skel.h" static void test_local_kptr_stash_simple (void ) { LIBBPF_OPTS(bpf_test_run_opts, opts,
@@ -51,10 +52,17 @@ static void test_local_kptr_stash_unstash(void)local_kptr_stash__destroy (skel); } -void test_local_kptr_stash_success (void ) +static void test_local_kptr_stash_fail (void ) +{ +RUN_TESTS (local_kptr_stash_fail); +} + +void test_local_kptr_stash (void ) {if (test__start_subtest ("local_kptr_stash_simple" ))test_local_kptr_stash_simple ();if (test__start_subtest ("local_kptr_stash_unstash" ))test_local_kptr_stash_unstash (); +if (test__start_subtest ("local_kptr_stash_fail" )) +test_local_kptr_stash_fail (); }
tools/testing/selftests/bpf/progs/local_kptr_stash_fail.c new file +65 -0
65 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH bpf-next v2 2/2] selftests/bpf: Add a failure test for bpf_kptr_xchg() with local kptr
Quoted 10 lines · Yonghong Song
For a
bpf_kptr_xchg()with local kptr, if the map value kptr type and allocated local obj type does not match, with the previous patch, the below verifier error message will be logged:
R2 is of type <allocated local obj type> but <map value kptr type> is expectedWithout the previous patch, the test will have unexpected success.
Signed-off-by Yonghong Song <[email protected]>---
Quoted 7 lines · Yonghong Song
When reviewing local percpu kptr support, Alexei discovered a bug wherea
bpf_kptr_xchg()may succeed even if the map value kptr type and locally allocated obj type do not match ([1]). Missed structbtf_idcomparison is the reason for the bug. This patch added such structbtf_idcomparison and will flag verification failure if types do not match.
Quoted 6 lines
[1] https://lore.kernel.org/bpf/20230819002907.io3iphmnuk43xblu@macbook-pro-8.dhcp.thefacebook.com/#t
Reported-by Alexei Starovoitov <[email protected]>Fixes 738c96d5e2e3 ("bpf: Allow local kptrs to be exchanged via bpf_kptr_xchg")Signed-off-by Yonghong Song <[email protected]>---
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Mon, 21 Aug 2023 22:00:53 -0700 you wrote:
When reviewing local percpu kptr support, Alexei discovered a bug wherea
bpf_kptr_xchg()may succeed even if the map value kptr type and locally allocated obj type do not match ([1]). Missed structbtf_idcomparison is the reason for the bug. This patch added such structbtf_idcomparison and will flag verification failure if types do not match.[1] https://lore.kernel.org/bpf/20230819002907.io3iphmnuk43xblu@macbook-pro-8.dhcp.thefacebook.com/#t
[...]
Here is the summary with links:
- [bpf-next,v2,1/2] bpf: Fix a bpf_kptr_xchg() issue with local kptr
https://git.kernel.org/bpf/bpf-next/c/ab6c637ad027 - [bpf-next,v2,2/2] selftests/bpf: Add a failure test for bpf_kptr_xchg() with local kptr https://git.kernel.org/bpf/bpf-next/c/fb3015942643
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html