2021-06-09 15:01:47

by Zhihao Cheng

Subject: [PATCH] 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 <[email protected]>
Signed-off-by: Zhihao Cheng <[email protected]>
---
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 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);
--
2.31.1

2021-06-09 17:32:23

by Quentin Monnet

Subject: Re: [PATCH] tools/bpftool: Fix error return code in do_batch()

2021-06-09 19:59 UTC+0800 ~ Zhihao Cheng <[email protected]>
> 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 <[email protected]>
> Signed-off-by: Zhihao Cheng <[email protected]>

Reviewed-by: Quentin Monnet <[email protected]>

Thank you for the fix.
Quentin

2021-06-15 06:27:14

by Andrii Nakryiko

Subject: Re: [PATCH] tools/bpftool: Fix error return code in do_batch()

On Wed, Jun 9, 2021 at 6:34 AM Quentin Monnet <[email protected]> wrote:
>
> 2021-06-09 19:59 UTC+0800 ~ Zhihao Cheng <[email protected]>
> > 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 <[email protected]>
> > Signed-off-by: Zhihao Cheng <[email protected]>
>
> Reviewed-by: Quentin Monnet <[email protected]>
>
> Thank you for the fix.

This has been applied to bpf-next last Friday. Patchbot missed it.

> Quentin