Commit 177e7716 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Daniel Borkmann
Browse files

bpf: Remove !func_info and !line_info check from test_btf and bpftool 



kernel can provide the func_info and line_info even
it fails the btf_dump_raw_ok() test because they don't contain
kernel address.  This patch removes the corresponding '== 0'
test.

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 9e794163

tools/bpf/bpftool/prog.c

+0 −7
Original line number Diff line number Diff line
@@ -596,13 +596,6 @@ static int do_dump(int argc, char **argv) 
		goto err_free;

	}



	if (func_info && !info.func_info) {

		/* kernel.kptr_restrict is set.  No func_info available. */

		free(func_info);

		func_info = NULL;

		nr_finfo = 0;

	}



	if (linfo && info.nr_line_info != nr_linfo) {

		p_err("incorrect nr_line_info %u vs. expected %u",

		      info.nr_line_info, nr_linfo);

tools/lib/bpf/bpf_prog_linfo.c

+1 −5
Original line number Diff line number Diff line
@@ -107,11 +107,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info) 


	nr_linfo = info->nr_line_info;



	/*

	 * Test !info->line_info because the kernel may NULL

	 * the ptr if kernel.kptr_restrict is set.

	 */

	if (!nr_linfo || !info->line_info)

	if (!nr_linfo)

		return NULL;



	/*

tools/testing/selftests/bpf/test_btf.c

+0 −7
Original line number Diff line number Diff line
@@ -3948,12 +3948,6 @@ static int test_get_finfo(const struct prog_info_raw_test *test, 
		goto done;

	}



	if (CHECK(!info.func_info,

		  "info.func_info == 0. kernel.kptr_restrict is set?")) {

		err = -1;

		goto done;

	}



	finfo = func_info;

	for (i = 0; i < test->func_info_cnt; i++) {

		if (CHECK(finfo->type_id != test->func_info[i][1],
@@ -4077,7 +4071,6 @@ static int test_get_linfo(const struct prog_info_raw_test *test, 
	 * Other fields are not the concern of this test.

	 */

	if (CHECK(err == -1 ||

		  !info.line_info ||

		  info.nr_line_info != cnt ||

		  (jited_cnt && !info.jited_line_info) ||

		  info.nr_jited_line_info != jited_cnt ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE