Skip to content

Commit

Permalink
selftests/bpf: Ensure core_reloc_kernel is reading test_progs's data …
Browse files Browse the repository at this point in the history
…only

test_core_reloc_kernel.c selftest is the only CO-RE test that reads and
returns for validation calling thread's information (pid, tgid, comm). Thus it
has to make sure that only test_prog's invocations are honored.

Fixes: df36e62 ("selftests/bpf: add CO-RE relocs testing setup")
Reported-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20191121175900.3486133-1-andriin@fb.com
  • Loading branch information
Andrii Nakryiko authored and Alexei Starovoitov committed Nov 25, 2019
1 parent 1aace10 commit 6147a14
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
16 changes: 11 additions & 5 deletions tools/testing/selftests/bpf/prog_tests/core_reloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <test_progs.h>
#include "progs/core_reloc_types.h"
#include <sys/mman.h>
#include <sys/syscall.h>

#define STRUCT_TO_CHAR_PTR(struct_name) (const char *)&(struct struct_name)

Expand Down Expand Up @@ -452,6 +453,7 @@ static struct core_reloc_test_case test_cases[] = {
struct data {
char in[256];
char out[256];
uint64_t my_pid_tgid;
};

static size_t roundup_page(size_t sz)
Expand All @@ -471,9 +473,12 @@ void test_core_reloc(void)
struct bpf_map *data_map;
struct bpf_program *prog;
struct bpf_object *obj;
uint64_t my_pid_tgid;
struct data *data;
void *mmap_data = NULL;

my_pid_tgid = getpid() | ((uint64_t)syscall(SYS_gettid) << 32);

for (i = 0; i < ARRAY_SIZE(test_cases); i++) {
test_case = &test_cases[i];
if (!test__start_subtest(test_case->case_name))
Expand Down Expand Up @@ -517,11 +522,6 @@ void test_core_reloc(void)
goto cleanup;
}

link = bpf_program__attach_raw_tracepoint(prog, tp_name);
if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n",
PTR_ERR(link)))
goto cleanup;

data_map = bpf_object__find_map_by_name(obj, "test_cor.bss");
if (CHECK(!data_map, "find_data_map", "data map not found\n"))
goto cleanup;
Expand All @@ -537,6 +537,12 @@ void test_core_reloc(void)

memset(mmap_data, 0, sizeof(*data));
memcpy(data->in, test_case->input, test_case->input_len);
data->my_pid_tgid = my_pid_tgid;

link = bpf_program__attach_raw_tracepoint(prog, tp_name);
if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n",
PTR_ERR(link)))
goto cleanup;

/* trigger test run */
usleep(1);
Expand Down
4 changes: 4 additions & 0 deletions tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ char _license[] SEC("license") = "GPL";
struct {
char in[256];
char out[256];
uint64_t my_pid_tgid;
} data = {};

struct core_reloc_kernel_output {
Expand Down Expand Up @@ -38,6 +39,9 @@ int test_core_kernel(void *ctx)
uint32_t real_tgid = (uint32_t)pid_tgid;
int pid, tgid;

if (data.my_pid_tgid != pid_tgid)
return 0;

if (CORE_READ(&pid, &task->pid) ||
CORE_READ(&tgid, &task->tgid))
return 1;
Expand Down

0 comments on commit 6147a14

Please sign in to comment.