From: Martin KaFai Lau Date: Fri, 10 Jan 2020 23:16:44 +0000 (-0800) Subject: bpftool: Fix printing incorrect pointer in btf_dump_ptr X-Git-Tag: Ubuntu-5.4.0-17.21~1478 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=304733d9801de507879a57144c4f26bcaefb5195;p=mirror_ubuntu-focal-kernel.git bpftool: Fix printing incorrect pointer in btf_dump_ptr BugLink: https://bugs.launchpad.net/bugs/1861090 commit 555089fdfc37ad65e0ee9b42ca40c238ff546f83 upstream. For plain text output, it incorrectly prints the pointer value "void *data". The "void *data" is actually pointing to memory that contains a bpf-map's value. The intention is to print the content of the bpf-map's value instead of printing the pointer pointing to the bpf-map's value. In this case, a member of the bpf-map's value is a pointer type. Thus, it should print the "*(void **)data". Fixes: 22c349e8db89 ("tools: bpftool: fix format strings and arguments for jsonw_printf()") Signed-off-by: Martin KaFai Lau Signed-off-by: Alexei Starovoitov Reviewed-by: Quentin Monnet Link: https://lore.kernel.org/bpf/20200110231644.3484151-1-kafai@fb.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Paolo Pisati --- diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c index d66131f69689..397e5716ab6d 100644 --- a/tools/bpf/bpftool/btf_dumper.c +++ b/tools/bpf/bpftool/btf_dumper.c @@ -26,7 +26,7 @@ static void btf_dumper_ptr(const void *data, json_writer_t *jw, bool is_plain_text) { if (is_plain_text) - jsonw_printf(jw, "%p", data); + jsonw_printf(jw, "%p", *(void **)data); else jsonw_printf(jw, "%lu", *(unsigned long *)data); }