summaryrefslogtreecommitdiffstats
path: root/tools/bpf
diff options
context:
space:
mode:
authorZhihao Cheng <chengzhihao1@huawei.com>2021-06-09 13:59:16 +0200
committerAndrii Nakryiko <andrii@kernel.org>2021-06-12 00:31:09 +0200
commitca16b429f39b4ce013bfa7e197f25681e65a2a42 (patch)
tree4a80bc04925b32035eeda57111de61558c9268f4 /tools/bpf
parentlibbpf: Simplify the return expression of bpf_object__init_maps function (diff)
downloadlinux-ca16b429f39b4ce013bfa7e197f25681e65a2a42.tar.xz
linux-ca16b429f39b4ce013bfa7e197f25681e65a2a42.zip
tools/bpftool: Fix error return code in do_batch()
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 668da745af3c2 ("tools: bpftool: add support for quotations ...") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Reviewed-by: Quentin Monnet <quentin@isovalent.com> Link: https://lore.kernel.org/bpf/20210609115916.2186872-1-chengzhihao1@huawei.com
Diffstat (limited to 'tools/bpf')
-rw-r--r--tools/bpf/bpftool/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index 7f2817d97079..3ddfd4843738 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -341,8 +341,10 @@ static int do_batch(int argc, char **argv)
n_argc = make_args(buf, n_argv, BATCH_ARG_NB_MAX, lines);
if (!n_argc)
continue;
- if (n_argc < 0)
+ if (n_argc < 0) {
+ err = n_argc;
goto err_close;
+ }
if (json_output) {
jsonw_start_object(json_wtr);