bpftool: Avoid leaking the JSON writer prepared for program metadata
authorQuentin Monnet <quentin@isovalent.com>
Fri, 22 Oct 2021 09:47:43 +0000 (10:47 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Fri, 22 Oct 2021 23:44:56 +0000 (16:44 -0700)
commite89ef634f81c9d90e1824ab183721f3b361472e6
tree1eec7ee66d53cc820e11d78009bb21087e0dc7b2
parent59f2a29c04128a46df0031d4deb4c4b07c5edcea
bpftool: Avoid leaking the JSON writer prepared for program metadata

Bpftool creates a new JSON object for writing program metadata in plain
text mode, regardless of metadata being present or not. Then this writer
is freed if any metadata has been found and printed, but it leaks
otherwise. We cannot destroy the object unconditionally, because the
destructor prints an undesirable line break. Instead, make sure the
writer is created only after we have found program metadata to print.

Found with valgrind.

Fixes: aff52e685eb3 ("bpftool: Support dumping metadata")
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211022094743.11052-1-quentin@isovalent.com
tools/bpf/bpftool/prog.c