redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

tools, bpftool: Add missing close before bpftool net attach exit 

[ Upstream commit 50431b4568 ]

progfd is created by prog_parse_fd() in do_attach() and before the latter
returns in case of success, the file descriptor should be closed.

Fixes: 04949ccc27 ("tools: bpftool: add net attach command to attach XDP on interface")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20201113115152.53178-1-wanghai38@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Wang Hai 2020-11-13 19:51:52 +08:00 committed by Greg Kroah-Hartman
parent 6eadbc3b7a
commit f5d6b6c2e9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/bpf/bpftool/net.c
View File

@ -312,8 +312,8 @@ static int do_attach(int argc, char **argv)
ifindex = net_parse_dev(&argc, &argv);
if (ifindex < 1) {
close(progfd);
return -EINVAL;
err = -EINVAL;
goto cleanup;
}
if (argc) {
@ -321,8 +321,8 @@ static int do_attach(int argc, char **argv)
overwrite = true;
} else {
p_err("expected 'overwrite', got: '%s'?", *argv);
close(progfd);
return -EINVAL;
err = -EINVAL;
goto cleanup;
}
}
@ -330,17 +330,17 @@ static int do_attach(int argc, char **argv)
if (is_prefix("xdp", attach_type_strings[attach_type]))
err = do_attach_detach_xdp(progfd, attach_type, ifindex,
overwrite);
if (err < 0) {
if (err) {
p_err("interface %s attach failed: %s",
attach_type_strings[attach_type], strerror(-err));
return err;
goto cleanup;
}
if (json_output)
jsonw_null(json_wtr);
return 0;
cleanup:
close(progfd);
return err;
}
static int do_detach(int argc, char **argv)