diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-12-22 20:36:06 +0100 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2017-12-23 01:09:52 +0100 |
| commit | 8207c6dd4746c345b689684c4cd0ce00a18c7ef2 (patch) | |
| tree | 36104aee2ea7b2b4a7326c369478890aad7243ef /tools | |
| parent | tools: bpftool: maps: close json array on error paths of show (diff) | |
| download | linux-8207c6dd4746c345b689684c4cd0ce00a18c7ef2.tar.xz linux-8207c6dd4746c345b689684c4cd0ce00a18c7ef2.zip | |
tools: bpftool: protect against races with disappearing objects
On program/map show we may get an ID of an object from GETNEXT,
but the object may disappear before we call GET_FD_BY_ID. If
that happens, ignore the object and continue.
Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool")
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 | 2 | ||||
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 8368b7ea31b5..a8c3a33dd185 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -528,6 +528,8 @@ static int do_show(int argc, char **argv) fd = bpf_map_get_fd_by_id(id); if (fd < 0) { + if (errno == ENOENT) + continue; p_err("can't get map by id (%u): %s", id, strerror(errno)); break; diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index ad619b96c276..dded77345bfb 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -382,6 +382,8 @@ static int do_show(int argc, char **argv) fd = bpf_prog_get_fd_by_id(id); if (fd < 0) { + if (errno == ENOENT) + continue; p_err("can't get prog by id (%u): %s", id, strerror(errno)); err = -1; |