summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlban Crequy <alban@kinvolk.io>2019-04-12 14:40:50 +0200
committerAlexei Starovoitov <ast@kernel.org>2019-04-25 17:20:06 -0700
commit8694d8c1f82cccec9380e0d3720b84eee315dfb7 (patch)
treed348d15c82218e9388a6b537dafb83cb4677a846 /tools
parentecfc3fcabbb5291d1e61600a3dac6cdbfdb04cb1 (diff)
downloadlinux-8694d8c1f82cccec9380e0d3720b84eee315dfb7.tar.bz2
tools: bpftool: fix infinite loop in map create
"bpftool map create" has an infinite loop on "while (argc)". The error case is missing. Symptoms: when forgetting to type the keyword 'type' in front of 'hash': $ sudo bpftool map create /sys/fs/bpf/dir/foobar hash key 8 value 8 entries 128 (infinite loop, taking all the CPU) ^C After the patch: $ sudo bpftool map create /sys/fs/bpf/dir/foobar hash key 8 value 8 entries 128 Error: unknown arg hash Fixes: 0b592b5a01be ("tools: bpftool: add map create command") Signed-off-by: Alban Crequy <alban@kinvolk.io> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Acked-by: Song Liu <songliubraving@fb.com> Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/bpf/bpftool/map.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index e0c650d91784..994a7e0d16fb 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -1151,6 +1151,9 @@ static int do_create(int argc, char **argv)
return -1;
}
NEXT_ARG();
+ } else {
+ p_err("unknown arg %s", *argv);
+ return -1;
}
}