diff options
| author | Quentin Monnet <quentin.monnet@netronome.com> | 2019-08-15 15:22:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 07:18:28 +0200 |
| commit | 52ba08b93fee220b416e98254e8f95e8d0958158 (patch) | |
| tree | b3a432d323f79774f0f3ca51a08e3dcae54aed10 /tools | |
| parent | 840aec7a8b483429f25c2963a6ba302b22c0a4ee (diff) | |
| download | linux-stable-52ba08b93fee220b416e98254e8f95e8d0958158.tar.gz linux-stable-52ba08b93fee220b416e98254e8f95e8d0958158.tar.bz2 linux-stable-52ba08b93fee220b416e98254e8f95e8d0958158.zip | |
tools: bpftool: close prog FD before exit on showing a single program
[ Upstream commit d34b044038bfb0e19caa8b019910efc465f41d5f ]
When showing metadata about a single program by invoking
"bpftool prog show PROG", the file descriptor referring to the program
is not closed before returning from the function. Let's close it.
Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool")
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 7a4e21a31523..d41651afe5f6 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -362,7 +362,9 @@ static int do_show(int argc, char **argv) if (fd < 0) return -1; - return show_prog(fd); + err = show_prog(fd); + close(fd); + return err; } if (argc) |