Commit d6f18371 authored by Yonghong Song's avatar Yonghong Song Committed by Daniel Borkmann

selftests/bpf: fix segfault of test_progs when prog loading failed

The test_progs subtests, test_spin_lock() and test_map_lock(),
requires BTF present to run successfully.
Currently, when BTF failed to load, test_progs will segfault,
  $ ./test_progs
  ...
  12: (bf) r1 = r8
  13: (85) call bpf_spin_lock#93
  map 'hash_map' has to have BTF in order to use bpf_spin_lock

  libbpf: -- END LOG --
  libbpf: failed to load program 'map_lock_demo'
  libbpf: failed to load object './test_map_lock.o'
  test_map_lock:bpf_prog_load errno 13
  Segmentation fault

The segfault is caused by uninitialized variable "obj", which
is used in bpf_object__close(obj), when bpf prog failed to load.

Initializing variable "obj" to NULL in two occasions fixed the problem.
  $ ./test_progs
  ...
  Summary: 219 PASSED, 2 FAILED

Fixes: b4d4556c ("selftests/bpf: add bpf_spin_lock verifier tests")
Fixes: ba72a7b4 ("selftests/bpf: test for BPF_F_LOCK")
Reported-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent f38a1f0a
...@@ -37,7 +37,7 @@ void test_map_lock(void) ...@@ -37,7 +37,7 @@ void test_map_lock(void)
const char *file = "./test_map_lock.o"; const char *file = "./test_map_lock.o";
int prog_fd, map_fd[2], vars[17] = {}; int prog_fd, map_fd[2], vars[17] = {};
pthread_t thread_id[6]; pthread_t thread_id[6];
struct bpf_object *obj; struct bpf_object *obj = NULL;
int err = 0, key = 0, i; int err = 0, key = 0, i;
void *ret; void *ret;
......
...@@ -5,7 +5,7 @@ void test_spinlock(void) ...@@ -5,7 +5,7 @@ void test_spinlock(void)
{ {
const char *file = "./test_spin_lock.o"; const char *file = "./test_spin_lock.o";
pthread_t thread_id[4]; pthread_t thread_id[4];
struct bpf_object *obj; struct bpf_object *obj = NULL;
int prog_fd; int prog_fd;
int err = 0, i; int err = 0, i;
void *ret; void *ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment