On Sun, Jun 30, 2024 at 07:13:31PM -0700, Zhu Jun wrote:
> The requested resources should be closed before return
> in main(), otherwise resource leak will occur
>
> Signed-off-by: Zhu Jun <zhujun2@xxxxxxxxxxxxxxxxxxxx>
could you please send this not as reply but as a separate patch with v2
> ---
> tools/testing/selftests/bpf/test_sockmap.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
> index a34e95040994..d51af986d9d8 100644
> --- a/tools/testing/selftests/bpf/test_sockmap.c
> +++ b/tools/testing/selftests/bpf/test_sockmap.c
> @@ -2075,8 +2075,10 @@ int main(int argc, char **argv)
>
> if (!cg_fd) {
> cg_fd = cgroup_setup_and_join(CG_PATH);
> - if (cg_fd < 0)
> - return cg_fd;
> + if (cg_fd < 0) {
> + err = cg_fd;
> + goto out1;
> + }
> cg_created = 1;
> }
>
> @@ -2092,7 +2094,7 @@ int main(int argc, char **argv)
> if (err) {
> fprintf(stderr, "populate program: (%s) %s\n",
> bpf_file, strerror(errno));
> - return 1;
> + goto out;
> }
> running = 1;
>
> @@ -2105,13 +2107,14 @@ int main(int argc, char **argv)
>
> err = run_options(&options, cg_fd, test);
> out:
could we check for cg_fd >= 0 and have just one out label? like:
out:
if (cg_fd >= 0)
close(cf_fd);
if (cg_created)
...
thanks,
jirka
> + close(cg_fd);
> + if (cg_created)
> + cleanup_cgroup_environment();
> +out1:
> if (options.whitelist)
> free(options.whitelist);
> if (options.blacklist)
> free(options.blacklist);
> - close(cg_fd);
> - if (cg_created)
> - cleanup_cgroup_environment();
> return err;
> }
>
> --
> 2.17.1
>
>
>
