* [PATCH v4 bpf] tools: bpftool: Add missing close before bpftool net attach exit
@ 2020-11-13 11:51 Wang Hai
2020-11-13 15:32 ` Daniel Borkmann
0 siblings, 1 reply; 2+ messages in thread
From: Wang Hai @ 2020-11-13 11:51 UTC (permalink / raw)
To: daniel, andrii.nakryiko, mrostecki, john.fastabend
Cc: bpf, netdev, linux-kernel
progfd is created by prog_parse_fd(), before 'bpftool net attach' exit,
it should be closed.
Fixes: 04949ccc273e ("tools: bpftool: add net attach command to attach XDP on interface")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
v3->v4: delete 'err = 0'
v2->v3: add 'err = 0' before successful return
v1->v2: use cleanup tag instead of repeated closes
tools/bpf/bpftool/net.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c
index 910e7bac6e9e..b27b3ee9f2aa 100644
--- a/tools/bpf/bpftool/net.c
+++ b/tools/bpf/bpftool/net.c
@@ -578,8 +578,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) {
@@ -587,8 +587,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;
}
}
@@ -597,16 +597,18 @@ static int do_attach(int argc, char **argv)
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)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v4 bpf] tools: bpftool: Add missing close before bpftool net attach exit
2020-11-13 11:51 [PATCH v4 bpf] tools: bpftool: Add missing close before bpftool net attach exit Wang Hai
@ 2020-11-13 15:32 ` Daniel Borkmann
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2020-11-13 15:32 UTC (permalink / raw)
To: Wang Hai, andrii.nakryiko, mrostecki, john.fastabend
Cc: bpf, netdev, linux-kernel
On 11/13/20 12:51 PM, Wang Hai wrote:
> progfd is created by prog_parse_fd(), before 'bpftool net attach' exit,
> it should be closed.
>
> Fixes: 04949ccc273e ("tools: bpftool: add net attach command to attach XDP on interface")
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
Applied & improved commit msg a bit, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-13 15:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13 11:51 [PATCH v4 bpf] tools: bpftool: Add missing close before bpftool net attach exit Wang Hai
2020-11-13 15:32 ` Daniel Borkmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).