Commit 785e76d7 authored by Quentin Monnet's avatar Quentin Monnet Committed by Daniel Borkmann

tools: bpftool: return from do_event_pipe() on bad arguments

When command line parsing fails in the while loop in do_event_pipe()
because the number of arguments is incorrect or because the keyword is
unknown, an error message is displayed, but bpftool remains stuck in
the loop. Make sure we exit the loop upon failure.

Fixes: f412eed9 ("tools: bpftool: add simple perf event output reader")
Signed-off-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent c0203475
...@@ -194,8 +194,10 @@ int do_event_pipe(int argc, char **argv) ...@@ -194,8 +194,10 @@ int do_event_pipe(int argc, char **argv)
} }
while (argc) { while (argc) {
if (argc < 2) if (argc < 2) {
BAD_ARG(); BAD_ARG();
goto err_close_map;
}
if (is_prefix(*argv, "cpu")) { if (is_prefix(*argv, "cpu")) {
char *endptr; char *endptr;
...@@ -221,6 +223,7 @@ int do_event_pipe(int argc, char **argv) ...@@ -221,6 +223,7 @@ int do_event_pipe(int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
} else { } else {
BAD_ARG(); BAD_ARG();
goto err_close_map;
} }
do_all = false; do_all = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment