bpftool: avoid leaking the JSON writer prepared for program metadata
Subsystems (4)
PATCH 1/1 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.
--- tools/bpf/bpftool/prog.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
tools/bpf/bpftool/prog.c +9 -7
@@ -307,18 +307,12 @@ static void show_prog_metadata(int fd, __u32 num_maps)if (printed_header)jsonw_end_object (json_wtr); }else { -json_writer_t *btf_wtr =jsonw_new (stdout); +json_writer_t *btf_wtr;struct btf_dumper d = { .btf = btf, - .jw = btf_wtr, .is_plain_text = true, }; -if (!btf_wtr) { -p_err ("jsonw alloc failed" ); - goto out_free; - } -for (i =0 ; i < vlen; i++, vsi++) { t_var =btf__type_by_id (btf, vsi->type); name =btf__name_by_offset (btf, t_var->name_off);
@@ -328,6 +322,14 @@ static void show_prog_metadata(int fd, __u32 num_maps)if (!printed_header) {printf ("\tmetadata:" ); + + btf_wtr =jsonw_new (stdout); +if (!btf_wtr) { +p_err ("jsonw alloc failed" ); + goto out_free; + } + d.jw = btf_wtr, + printed_header = true; }
Signature · 1 line
2.30.2
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 8 lines · On Fri, 22 Oct 2021 10:47:43 +0100 you wrote:
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.
[...]
Here is the summary with links:
- [bpf-next] bpftool: avoid leaking the JSON writer prepared for program metadata
https://git.kernel.org/bpf/bpf-next/c/e89ef634f81c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html