| Message ID | 20201110014637.6055-1-wanghai38@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | [v2,bpf] tools: bpftool: Add missing close before bpftool net attach exit | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for bpf |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 37 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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> > --- > v1->v2: use cleanup tag instead of repeated closes > tools/bpf/bpftool/net.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c > index 910e7bac6e9e..1ac7228167e6 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; > } > } > > @@ -600,13 +600,15 @@ static int do_attach(int argc, char **argv) I think now that return value depends on this err it should be 'if (err)' otherwise we risk retunring non-zero error code from do_attach which will cause programs to fail. > 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; Alternatively we could add an 'err = 0' here, but above should never return a value >0 as far as I can see. Thanks, John > +cleanup: > + close(progfd); > + return err; > } > > static int do_detach(int argc, char **argv) > -- > 2.17.1 >
在 2020/11/10 12:33, John Fastabend 写道: > 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> >> --- >> v1->v2: use cleanup tag instead of repeated closes >> tools/bpf/bpftool/net.c | 14 ++++++++------ >> 1 file changed, 8 insertions(+), 6 deletions(-) >> >> diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c >> index 910e7bac6e9e..1ac7228167e6 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; >> } >> } >> >> @@ -600,13 +600,15 @@ static int do_attach(int argc, char **argv) > I think now that return value depends on this err it should be 'if (err)' > otherwise we risk retunring non-zero error code from do_attach which > will cause programs to fail. I agree with you. Thanks. >> 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; > > Alternatively we could add an 'err = 0' here, but above should never > return a value >0 as far as I can see. It's true that 'err > 0' doesn't exist currently , but adding 'err = 0' would make the code clearer. Thanks for your advice. >> +cleanup: >> + close(progfd); >> + return err; >> } >> >> static int do_detach(int argc, char **argv) >> -- >> 2.17.1 >> Can it be fixed like this? --- 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,19 @@ 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; + ret = 0; +cleanup: + close(progfd); + return err; } > > . >
wanghai (M) wrote: > > 在 2020/11/10 12:33, John Fastabend 写道: > > 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> > >> --- [...] > > Alternatively we could add an 'err = 0' here, but above should never > > return a value >0 as far as I can see. > It's true that 'err > 0' doesn't exist currently , but adding 'err = 0' > would make the code clearer. Thanks for your advice. > >> +cleanup: > >> + close(progfd); > >> + return err; > >> } > >> > >> static int do_detach(int argc, char **argv) > >> -- > >> 2.17.1 > >> > Can it be fixed like this? > > --- 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,19 @@ 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; > + ret = 0; > +cleanup: > + close(progfd); > + return err; > } > LGTM. Send a v3.
diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c index 910e7bac6e9e..1ac7228167e6 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; } } @@ -600,13 +600,15 @@ static int do_attach(int argc, char **argv) if (err < 0) { 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)
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> --- v1->v2: use cleanup tag instead of repeated closes tools/bpf/bpftool/net.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)