6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ding Xiang dingxiang@cmss.chinamobile.com
commit 2a2015495142ee0a35711b5dcf7b215c31489f27 upstream.
The opened file should be closed before return, otherwise resource leak will occur.
Signed-off-by: Ding Xiang dingxiang@cmss.chinamobile.com Link: https://lore.kernel.org/r/20230830101148.3738-1-dingxiang@cmss.chinamobile.c... Fixes: 3de64b656b3c ("selftests/landlock: Add supports_filesystem() helper") Signed-off-by: Mickaël Salaün mic@digikod.net Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- 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; }