This is a note to let you know that I've just added the patch titled
selftests/landlock: Fix a resource leak
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selftests-landlock-fix-a-resource-leak.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2a2015495142ee0a35711b5dcf7b215c31489f27 Mon Sep 17 00:00:00 2001
From: Ding Xiang <dingxiang@xxxxxxxxxxxxxxxxxxxx>
Date: Wed, 30 Aug 2023 18:11:48 +0800
Subject: selftests/landlock: Fix a resource leak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ding Xiang <dingxiang@xxxxxxxxxxxxxxxxxxxx>
commit 2a2015495142ee0a35711b5dcf7b215c31489f27 upstream.
The opened file should be closed before return, otherwise resource leak
will occur.
Signed-off-by: Ding Xiang <dingxiang@xxxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230830101148.3738-1-dingxiang@xxxxxxxxxxxxxxxxxxxx
Fixes: 3de64b656b3c ("selftests/landlock: Add supports_filesystem() helper")
Signed-off-by: Mickaël Salaün <mic@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/landlock/fs_test.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- 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 ch
{
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 ch
/* 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;
}
Patches currently in stable-queue which might be from dingxiang@xxxxxxxxxxxxxxxxxxxx are
queue-6.5/selftests-landlock-fix-a-resource-leak.patch
