From: Jiri Olsa <olsajiri@gmail.com>
To: Zhu Jun <zhujun2@cmss.chinamobile.com>
Cc: daniel@iogearbox.net, andrii@kernel.org, ast@kernel.org,
bpf@vger.kernel.org, eddyz87@gmail.com, haoluo@google.com,
john.fastabend@gmail.com, kpsingh@kernel.org,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
martin.lau@linux.dev, mykolal@fb.com, sdf@fomichev.me,
shuah@kernel.org, song@kernel.org, yonghong.song@linux.dev
Subject: Re: [PATCH] selftests/bpf:fix a resource leak
Date: Mon, 1 Jul 2024 11:27:13 +0200 [thread overview]
Message-ID: <ZoJ2cTg8-BgJ2KNg@krava> (raw)
In-Reply-To: <20240701021331.3057-1-zhujun2@cmss.chinamobile.com>
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@cmss.chinamobile.com>
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
>
>
>
next prev parent reply other threads:[~2024-07-01 9:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 6:01 [PATCH] selftests/bpf:fix a resource leak Zhu Jun
2024-06-28 22:23 ` Daniel Borkmann
2024-07-01 2:13 ` Zhu Jun
2024-07-01 9:27 ` Jiri Olsa [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-09 9:38 Zhu Jun
2024-07-09 11:03 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZoJ2cTg8-BgJ2KNg@krava \
--to=olsajiri@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
--cc=zhujun2@cmss.chinamobile.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox