aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToke Høiland-Jørgensen <toke@redhat.com>2020-02-06 11:29:06 +0100
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-03-20 23:11:48 -0400
commit92c6c9b7f61049f71f997b06c031f9ab0524bce5 (patch)
tree9ff685c149423cb24e0225f9c671e9547ca7aaab
parent67aed576b819f5b6061f3efd889626a0377f48b9 (diff)
downloadlinux-yocto-92c6c9b7f61049f71f997b06c031f9ab0524bce5.tar.gz
linux-yocto-92c6c9b7f61049f71f997b06c031f9ab0524bce5.tar.bz2
linux-yocto-92c6c9b7f61049f71f997b06c031f9ab0524bce5.zip
bpftool: Don't crash on missing xlated program instructions
commit d95f1e8b462c4372ac409886070bb8719d8a4d3a upstream. 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: 5b79bcdf0362 ("bpftool: Don't crash on missing jited insns or ksyms") Fixes: cae73f233923 ("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 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--tools/bpf/bpftool/prog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 2971499c45df..9e6dc94726b3 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -499,7 +499,7 @@ static int do_dump(int argc, char **argv)
buf = (unsigned char *)(info->jited_prog_insns);
member_len = info->jited_prog_len;
} 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?");
goto err_free;
}