| From 56bae79aceca6e020a1d500aebb0f8484c1bf311 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 9 Jun 2021 19:59:16 +0800 |
| Subject: tools/bpftool: Fix error return code in do_batch() |
| |
| From: Zhihao Cheng <chengzhihao1@huawei.com> |
| |
| [ Upstream commit ca16b429f39b4ce013bfa7e197f25681e65a2a42 ] |
| |
| 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 |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/bpf/bpftool/main.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c |
| index 33068d6ed5d6..c58a135dc355 100644 |
| --- a/tools/bpf/bpftool/main.c |
| +++ b/tools/bpf/bpftool/main.c |
| @@ -338,8 +338,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); |
| -- |
| 2.30.2 |
| |