korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 22:14:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

selftests/bpf: Test for writes to map key from BPF helpers

Browse Source 
When invoking bpf_for_each_map_elem callback, we are passed a
PTR_TO_MAP_KEY, previously writes to this through helper may be allowed,
but the fix in previous patches is meant to prevent that case. The test
case tries to pass it as writable memory to helper, and fails test if it
succeeds to pass the verifier.

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20220319080827.73251-6-memxor@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Kumar Kartikeya Dwivedi 2022-03-19 13:38:27 +05:30 committed by Alexei Starovoitov
parent 7cb29b1c99
commit 9fc4476a08
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/selftests/bpf/prog_tests/for_each.c
View File

@ -4,6 +4,7 @@
#include <network_helpers.h> #include <network_helpers.h>
#include "for_each_hash_map_elem.skel.h" #include "for_each_hash_map_elem.skel.h"
#include "for_each_array_map_elem.skel.h" #include "for_each_array_map_elem.skel.h"
#include "for_each_map_elem_write_key.skel.h"
static unsigned int duration; static unsigned int duration;
@ -129,10 +130,21 @@ out:
for_each_array_map_elem__destroy(skel); for_each_array_map_elem__destroy(skel);
} }
static void test_write_map_key(void)
{
struct for_each_map_elem_write_key *skel;
skel = for_each_map_elem_write_key__open_and_load();
if (!ASSERT_ERR_PTR(skel, "for_each_map_elem_write_key__open_and_load"))
for_each_map_elem_write_key__destroy(skel);
}
void test_for_each(void) void test_for_each(void)
{ {
if (test__start_subtest("hash_map")) if (test__start_subtest("hash_map"))
test_hash_map(); test_hash_map();
if (test__start_subtest("array_map")) if (test__start_subtest("array_map"))
test_array_map(); test_array_map();
if (test__start_subtest("write_map_key"))
test_write_map_key();
} }

27
tools/testing/selftests/bpf/progs/for_each_map_elem_write_key.c Normal file
View File

@ -0,0 +1,27 @@
// SPDX-License-Identifier: GPL-2.0
#include <vmlinux.h>
#include <bpf/bpf_helpers.h>
struct {
__uint(type, BPF_MAP_TYPE_ARRAY);
__uint(max_entries, 1);
__type(key, __u32);
__type(value, __u64);
} array_map SEC(".maps");
static __u64
check_array_elem(struct bpf_map *map, __u32 *key, __u64 *val,
void *data)
{
bpf_get_current_comm(key, sizeof(*key));
return 0;
}
SEC("raw_tp/sys_enter")
int test_map_key_write(const void *ctx)
{
bpf_for_each_map_elem(&array_map, check_array_elem, NULL, 0);
return 0;
}
char _license[] SEC("license") = "GPL";