hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpftool: Don't crash on missing xlated program instructions 

Turns out the xlated program instructions can also be missing if
kptr_restrict sysctl is set. This means that the previous fix to check the
jited_prog_insns pointer was insufficient; add another check of the
xlated_prog_insns pointer as well.

Fixes: 5b79bcdf03 ("bpftool: Don't crash on missing jited insns or ksyms")
Fixes: cae73f2339 ("bpftool: use bpf_program__get_prog_info_linear() in prog.c:do_dump()")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20200206102906.112551-1-toke@redhat.com
This commit is contained in:
Toke Høiland-Jørgensen 2020-02-06 11:29:06 +01:00 committed by Daniel Borkmann
parent 85b8ac01a4
commit d95f1e8b46
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/bpf/bpftool/prog.c
View File

@ -536,7 +536,7 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode,
buf = (unsigned char *)(info->jited_prog_insns); buf = (unsigned char *)(info->jited_prog_insns);
member_len = info->jited_prog_len; member_len = info->jited_prog_len;
} else { /* DUMP_XLATED */ } else { /* DUMP_XLATED */
if (info->xlated_prog_len == 0) { if (info->xlated_prog_len == 0 || !info->xlated_prog_insns) {
p_err("error retrieving insn dump: kernel.kptr_restrict set?"); p_err("error retrieving insn dump: kernel.kptr_restrict set?");
return -1; return -1;
} }