iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: bpftool: preserve JSON for batch mode when dumping insns to file

Browse Source 
Print a "null" JSON object to standard output when bpftool is used to
print program instructions to a file, so as to avoid breaking JSON
output on batch mode.

This null object was added for most commands in a previous commit, but
this specific case had been omitted.

Fixes: 004b45c0e51a ("tools: bpftool: provide JSON output for all possible commands")
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Quentin Monnet 2018-02-14 22:42:54 -08:00 committed by Daniel Borkmann
parent 9c481b908b
commit 52c84d36b7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,6 +774,9 @@ static int do_dump(int argc, char **argv)
n < 0 ? strerror(errno) : "short write"); n < 0 ? strerror(errno) : "short write");
goto err_free; goto err_free;
} }
if (json_output)
jsonw_null(json_wtr);
} else { } else {
if (member_len == &info.jited_prog_len) { if (member_len == &info.jited_prog_len) {
const char *name = NULL; const char *name = NULL;