diff options
| author |   Daniel Borkmann <daniel@iogearbox.net> | 2018-12-13 12:16:31 +0100 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-12-13 12:16:32 +0100 |
| commit | 0ad379ffd654aa4348fdffa33aada4c9de76a22e (patch) | |
| tree | da39631926f29fbb7dd194f2b87c949631f5ebe8 /tools/testing | |
| parent | Merge branch 'bpf-bpftool-license-update' (diff) | |
| parent | bpf: Remove !func_info and !line_info check from test_btf and bpftool (diff) | |
Merge branch 'bpf-fix-kptr-checks'
Martin KaFai Lau says:
====================
This patch set removes the bpf_dump_raw_ok() guard for the func_info
and line_info during bpf_prog_get_info_by_fd().
====================
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/bpf/test_btf.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftests/bpf/test_btf.c index f570e0a39959..8478316aaf9a 100644 --- a/tools/testing/selftests/bpf/test_btf.c +++ b/tools/testing/selftests/bpf/test_btf.c @@ -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 || |