selftests: bpf: initialize bpf_object pointers where needed
authorLorenz Bauer <lmb@cloudflare.com>
Wed, 8 May 2019 16:49:32 +0000 (17:49 +0100)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 9 May 2019 22:53:56 +0000 (15:53 -0700)
There are a few tests which call bpf_object__close on uninitialized
bpf_object*, which may segfault. Explicitly zero-initialise these pointers
to avoid this.

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c
tools/testing/selftests/bpf/prog_tests/tp_attach_query.c

index 23b159d..b74e2f6 100644 (file)
@@ -15,7 +15,7 @@ static int libbpf_debug_print(enum libbpf_print_level level,
 static int check_load(const char *file)
 {
        struct bpf_prog_load_attr attr;
-       struct bpf_object *obj;
+       struct bpf_object *obj = NULL;
        int err, prog_fd;
 
        memset(&attr, 0, sizeof(struct bpf_prog_load_attr));
index d636a4f..f9b70e8 100644 (file)
@@ -9,7 +9,7 @@ static void test_task_fd_query_tp_core(const char *probe_name,
        struct perf_event_attr attr = {};
        __u64 probe_offset, probe_addr;
        __u32 len, prog_id, fd_type;
-       struct bpf_object *obj;
+       struct bpf_object *obj = NULL;
        __u32 duration = 0;
        char buf[256];
 
index a2f476f..fb095e5 100644 (file)
@@ -13,6 +13,9 @@ void test_tp_attach_query(void)
        struct bpf_prog_info prog_info;
        char buf[256];
 
+       for (i = 0; i < num_progs; i++)
+               obj[i] = NULL;
+
        snprintf(buf, sizeof(buf),
                 "/sys/kernel/debug/tracing/events/sched/sched_switch/id");
        efd = open(buf, O_RDONLY, 0);