diff options
| author | Daniel Borkmann <[email protected]> | 2018-12-13 11:16:31 +0000 |
|---|---|---|
| committer | Daniel Borkmann <[email protected]> | 2018-12-13 11:16:32 +0000 |
| commit | 0ad379ffd654aa4348fdffa33aada4c9de76a22e (patch) | |
| tree | da39631926f29fbb7dd194f2b87c949631f5ebe8 /tools/bpf/bpftool/prog.c | |
| parent | Merge branch 'bpf-bpftool-license-update' (diff) | |
| parent | bpf: Remove !func_info and !line_info check from test_btf and bpftool (diff) | |
| download | kernel-0ad379ffd654aa4348fdffa33aada4c9de76a22e.tar.gz kernel-0ad379ffd654aa4348fdffa33aada4c9de76a22e.zip | |
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 <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index eddf7fba41c6..ee51279be9c7 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -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); |