lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 14 Feb 2018 22:42:54 -0800 From: Jakub Kicinski <jakub.kicinski@...ronome.com> To: daniel@...earbox.net, alexei.starovoitov@...il.com Cc: netdev@...r.kernel.org, oss-drivers@...ronome.com, Quentin Monnet <quentin.monnet@...ronome.com> Subject: [PATCH bpf 1/2] tools: bpftool: preserve JSON for batch mode when dumping insns to file From: Quentin Monnet <quentin.monnet@...ronome.com> 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@...ronome.com> Acked-by: Jakub Kicinski <jakub.kicinski@...ronome.com> --- tools/bpf/bpftool/prog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index e8e2baaf93c2..e549e329be82 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -774,6 +774,9 @@ static int do_dump(int argc, char **argv) n < 0 ? strerror(errno) : "short write"); goto err_free; } + + if (json_output) + jsonw_null(json_wtr); } else { if (member_len == &info.jited_prog_len) { const char *name = NULL; -- 2.15.1
Powered by blists - more mailing lists