linux-kernel - Re: [PATCH v1] selftests/landlock: Fix a resource leak

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20230830.paiqu8Caew1X@digikod.net>
Date:   Wed, 30 Aug 2023 19:04:59 +0200
From:   Mickaël Salaün <mic@...ikod.net>
To:     Ding Xiang <dingxiang@...s.chinamobile.com>
Cc:     shuah@...nel.org, linux-security-module@...r.kernel.org,
        linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v1] selftests/landlock: Fix a resource leak

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@...s.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
> 
> 
>