diff options
| author | Taeung Song <treeze.taeung@gmail.com> | 2018-07-19 21:10:05 +0900 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-07-20 10:16:54 +0200 |
| commit | 759b94a00a207ef605f3fd6f6e99570799688145 (patch) | |
| tree | 5cbf780a0d57a7c4b80ac978791590e734ea0b48 /tools/bpf | |
| parent | bb3928673955b423db270982ff7dad19a3e22d9c (diff) | |
| download | linux-stable-759b94a00a207ef605f3fd6f6e99570799688145.tar.gz linux-stable-759b94a00a207ef605f3fd6f6e99570799688145.tar.bz2 linux-stable-759b94a00a207ef605f3fd6f6e99570799688145.zip | |
tools/bpftool: Fix segfault case regarding 'pin' arguments
Arguments of 'pin' subcommand should be checked
at the very beginning of do_pin_any().
Otherwise segfault errors can occur when using
'map pin' or 'prog pin' commands, so fix it.
# bpftool prog pin id
Segmentation fault
Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool")
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reported-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/bpf')
| -rw-r--r-- | tools/bpf/bpftool/common.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 32f9e397a6c0..3f140eff039f 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -217,6 +217,14 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) int err; int fd; + if (argc < 3) { + p_err("too few arguments, id ID and FILE path is required"); + return -1; + } else if (argc > 3) { + p_err("too many arguments"); + return -1; + } + if (!is_prefix(*argv, "id")) { p_err("expected 'id' got %s", *argv); return -1; @@ -230,9 +238,6 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) } NEXT_ARG(); - if (argc != 1) - usage(); - fd = get_fd_by_id(id); if (fd < 0) { p_err("can't get prog by id (%u): %s", id, strerror(errno)); |