summaryrefslogtreecommitdiffstats
path: root/tools/bpf
diff options
context:
space:
mode:
authorTiezhu Yang <yangtiezhu@loongson.cn>2022-11-15 14:00:07 +0100
committerAlexei Starovoitov <ast@kernel.org>2022-11-16 06:36:24 +0100
commitdf9c41e9db2d0fc9feba0423c21e4319d8acd033 (patch)
tree90c478f3c9b4ac77c118ae5512bf6bab1bbe7315 /tools/bpf
parentdocs/bpf: Fix sample code in MAP_TYPE_ARRAY docs (diff)
downloadlinux-df9c41e9db2d0fc9feba0423c21e4319d8acd033.tar.xz
linux-df9c41e9db2d0fc9feba0423c21e4319d8acd033.zip
bpftool: Check argc first before "file" in do_batch()
If the parameters for batch are more than 2, check argc first can return immediately, no need to use is_prefix() to check "file" with a little overhead and then check argc, it is better to check "file" only when the parameters for batch are 2. Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Acked-by: Stanislav Fomichev <sdf@google.com> Reviewed-by: Quentin Monnet <quentin@isovalent.com> Link: https://lore.kernel.org/r/1668517207-11822-1-git-send-email-yangtiezhu@loongson.cn Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/bpf')
-rw-r--r--tools/bpf/bpftool/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index 741e50ee0b6c..337ab7977ea4 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -337,12 +337,12 @@ static int do_batch(int argc, char **argv)
if (argc < 2) {
p_err("too few parameters for batch");
return -1;
- } else if (!is_prefix(*argv, "file")) {
- p_err("expected 'file', got: %s", *argv);
- return -1;
} else if (argc > 2) {
p_err("too many parameters for batch");
return -1;
+ } else if (!is_prefix(*argv, "file")) {
+ p_err("expected 'file', got: %s", *argv);
+ return -1;
}
NEXT_ARG();