diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-12-22 11:36:05 -0800 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2017-12-23 01:09:52 +0100 |
| commit | b3b1b6532890c70987821946f90c22b8021aaaf8 (patch) | |
| tree | 1d92de9cfddf5c02a872b48e5bbc5d9e08d54f8d /tools | |
| parent | cd95a89282ef61458c3758d70ebfbd91f303033f (diff) | |
| download | linux-b3b1b6532890c70987821946f90c22b8021aaaf8.tar.gz linux-b3b1b6532890c70987821946f90c22b8021aaaf8.tar.bz2 linux-b3b1b6532890c70987821946f90c22b8021aaaf8.zip | |
tools: bpftool: maps: close json array on error paths of show
We can't return from the middle of do_show(), because
json_array will not be closed. Break out of the loop.
Note that the error handling after the loop depends on
errno, so no need to set err.
Fixes: 831a0aafe5c3 ("tools: bpftool: add JSON output for `bpftool map *` commands")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bpf/bpftool/map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index e2450c8e88e6..8368b7ea31b5 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -523,21 +523,21 @@ static int do_show(int argc, char **argv) break; p_err("can't get next map: %s%s", strerror(errno), errno == EINVAL ? " -- kernel too old?" : ""); - return -1; + break; } fd = bpf_map_get_fd_by_id(id); if (fd < 0) { p_err("can't get map by id (%u): %s", id, strerror(errno)); - return -1; + break; } err = bpf_obj_get_info_by_fd(fd, &info, &len); if (err) { p_err("can't get map info: %s", strerror(errno)); close(fd); - return -1; + break; } if (json_output) |