* [PATCH] selftests/landlock: Fix a resource leak
@ 2023-08-30 6:08 Ding Xiang
2023-08-30 9:01 ` Mickaël Salaün
0 siblings, 1 reply; 2+ messages in thread
From: Ding Xiang @ 2023-08-30 6:08 UTC (permalink / raw)
To: shuah, mic; +Cc: linux-security-module, linux-kselftest, linux-kernel
The opened file should be closed before return,
otherwise resource leak will occur
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
---
tools/testing/selftests/landlock/fs_test.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
index 83d565569512..687a66ea9799 100644
--- a/tools/testing/selftests/landlock/fs_test.c
+++ b/tools/testing/selftests/landlock/fs_test.c
@@ -124,13 +124,17 @@ static bool supports_filesystem(const char *const filesystem)
return true;
/* filesystem can be null for bind mounts. */
- if (!filesystem)
+ if (!filesystem) {
+ fclose(inf);
return true;
+ }
len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem);
- if (len >= sizeof(str))
+ if (len >= sizeof(str)) {
+ fclose(inf);
/* Ignores too-long filesystem names. */
return true;
+ }
res = fgrep(inf, str);
fclose(inf);
--
2.38.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] selftests/landlock: Fix a resource leak
2023-08-30 6:08 [PATCH] selftests/landlock: Fix a resource leak Ding Xiang
@ 2023-08-30 9:01 ` Mickaël Salaün
0 siblings, 0 replies; 2+ messages in thread
From: Mickaël Salaün @ 2023-08-30 9:01 UTC (permalink / raw)
To: Ding Xiang; +Cc: shuah, linux-security-module, linux-kselftest, linux-kernel
Hi,
Thanks for this fix. A few suggestions:
On Wed, Aug 30, 2023 at 02:08:58PM +0800, Ding Xiang wrote:
> The opened file should be closed before return,
> otherwise resource leak will occur
>
> Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
> ---
> tools/testing/selftests/landlock/fs_test.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
> index 83d565569512..687a66ea9799 100644
> --- a/tools/testing/selftests/landlock/fs_test.c
> +++ b/tools/testing/selftests/landlock/fs_test.c
> @@ -124,13 +124,17 @@ static bool supports_filesystem(const char *const filesystem)
> return true;
>
> /* filesystem can be null for bind mounts. */
> - if (!filesystem)
> + if (!filesystem) {
> + fclose(inf);
> return true;
Can you please change these two lines (and the next hunk) with a
`goto out` (and then don't add the if braces), initialize res to true
when it is declared, and add the `out` label below?
> + }
>
> len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem);
> - if (len >= sizeof(str))
> + if (len >= sizeof(str)) {
> + fclose(inf);
> /* Ignores too-long filesystem names. */
> return true;
> + }
>
> res = fgrep(inf, str);
out:
> fclose(inf);
> --
> 2.38.1
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-30 18:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-30 6:08 [PATCH] selftests/landlock: Fix a resource leak Ding Xiang
2023-08-30 9:01 ` Mickaël Salaün
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).