From: Quentin Monnet <quentin.monnet@netronome.com>
Date: Thu, 15 Feb 2018 06:42:54 +0000 (-0800)
Subject: tools: bpftool: preserve JSON for batch mode when dumping insns to file
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=52c84d36b7e2f8197a9a6174d6f901a7c7afb850;p=openwrt%2Fstaging%2Fblogic.git

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

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>
---

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;