* [PATCH v1] selftests/landlock: Fix a resource leak
@ 2023-08-30 10:11 Ding Xiang
2023-08-30 17:04 ` Mickaël Salaün
0 siblings, 1 reply; 2+ messages in thread
From: Ding Xiang @ 2023-08-30 10:11 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, 5 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
index 83d565569512..251594306d40 100644
--- a/tools/testing/selftests/landlock/fs_test.c
+++ b/tools/testing/selftests/landlock/fs_test.c
@@ -113,7 +113,7 @@ static bool supports_filesystem(const char *const filesystem)
{
char str[32];
int len;
- bool res;
+ bool res = true;
FILE *const inf = fopen("/proc/filesystems", "r");
/*
@@ -125,14 +125,16 @@ static bool supports_filesystem(const char *const filesystem)
/* filesystem can be null for bind mounts. */
if (!filesystem)
- return true;
+ goto out;
len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem);
if (len >= sizeof(str))
/* Ignores too-long filesystem names. */
- return true;
+ goto out;
res = fgrep(inf, str);
+
+out:
fclose(inf);
return res;
}
--
2.38.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1] selftests/landlock: Fix a resource leak
2023-08-30 10:11 [PATCH v1] selftests/landlock: Fix a resource leak Ding Xiang
@ 2023-08-30 17:04 ` Mickaël Salaün
0 siblings, 0 replies; 2+ messages in thread
From: Mickaël Salaün @ 2023-08-30 17:04 UTC (permalink / raw)
To: Ding Xiang; +Cc: shuah, linux-security-module, linux-kselftest, linux-kernel
Applied to my next tree. Thanks!
On Wed, Aug 30, 2023 at 06:11:48PM +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, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
> index 83d565569512..251594306d40 100644
> --- a/tools/testing/selftests/landlock/fs_test.c
> +++ b/tools/testing/selftests/landlock/fs_test.c
> @@ -113,7 +113,7 @@ static bool supports_filesystem(const char *const filesystem)
> {
> char str[32];
> int len;
> - bool res;
> + bool res = true;
> FILE *const inf = fopen("/proc/filesystems", "r");
>
> /*
> @@ -125,14 +125,16 @@ static bool supports_filesystem(const char *const filesystem)
>
> /* filesystem can be null for bind mounts. */
> if (!filesystem)
> - return true;
> + goto out;
>
> len = snprintf(str, sizeof(str), "nodev\t%s\n", filesystem);
> if (len >= sizeof(str))
> /* Ignores too-long filesystem names. */
> - return true;
> + goto out;
>
> res = fgrep(inf, str);
> +
> +out:
> fclose(inf);
> return res;
> }
> --
> 2.38.1
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-30 18:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-30 10:11 [PATCH v1] selftests/landlock: Fix a resource leak Ding Xiang
2023-08-30 17:04 ` 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).