Commit 07b61991 authored by Lorenz Bauer's avatar Lorenz Bauer Committed by Alexei Starovoitov
Browse files

selftests: bpf: initialize bpf_object pointers where needed 



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: default avatarLorenz Bauer <lmb@cloudflare.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 494bc1d2

tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

tools/testing/selftests/bpf/prog_tests/tp_attach_query.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE