linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] selftests: vm: Fix resource leak when return error
@ 2022-06-15  9:36 Ding Xiang
  2022-06-16 20:11 ` Shuah Khan
  0 siblings, 1 reply; 3+ messages in thread
From: Ding Xiang @ 2022-06-15  9:36 UTC (permalink / raw)
  To: akpm, shuah; +Cc: linux-mm, linux-kselftest, linux-kernel

When return on an error path, file handle need to be closed
to prevent resource leak

Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
---
 tools/testing/selftests/vm/ksm_tests.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c
index 2fcf24312da8..f5e4e0bbd081 100644
--- a/tools/testing/selftests/vm/ksm_tests.c
+++ b/tools/testing/selftests/vm/ksm_tests.c
@@ -54,6 +54,7 @@ static int ksm_write_sysfs(const char *file_path, unsigned long val)
 	}
 	if (fprintf(f, "%lu", val) < 0) {
 		perror("fprintf");
+		fclose(f);
 		return 1;
 	}
 	fclose(f);
@@ -72,6 +73,7 @@ static int ksm_read_sysfs(const char *file_path, unsigned long *val)
 	}
 	if (fscanf(f, "%lu", val) != 1) {
 		perror("fscanf");
+		fclose(f);
 		return 1;
 	}
 	fclose(f);
-- 
2.31.1




^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] selftests: vm: Fix resource leak when return error
  2022-06-15  9:36 [PATCH] selftests: vm: Fix resource leak when return error Ding Xiang
@ 2022-06-16 20:11 ` Shuah Khan
  2022-06-16 20:19   ` Shuah Khan
  0 siblings, 1 reply; 3+ messages in thread
From: Shuah Khan @ 2022-06-16 20:11 UTC (permalink / raw)
  To: Ding Xiang, akpm, shuah
  Cc: linux-mm, linux-kselftest, linux-kernel, Shuah Khan

On 6/15/22 3:36 AM, Ding Xiang wrote:
> When return on an error path, file handle need to be closed
> to prevent resource leak
> 
> Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
> ---
>   tools/testing/selftests/vm/ksm_tests.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c
> index 2fcf24312da8..f5e4e0bbd081 100644
> --- a/tools/testing/selftests/vm/ksm_tests.c
> +++ b/tools/testing/selftests/vm/ksm_tests.c
> @@ -54,6 +54,7 @@ static int ksm_write_sysfs(const char *file_path, unsigned long val)
>   	}
>   	if (fprintf(f, "%lu", val) < 0) {
>   		perror("fprintf");
> +		fclose(f);
>   		return 1;
>   	}
>   	fclose(f);
> @@ -72,6 +73,7 @@ static int ksm_read_sysfs(const char *file_path, unsigned long *val)
>   	}
>   	if (fscanf(f, "%lu", val) != 1) {
>   		perror("fscanf");
> +		fclose(f);
>   		return 1;
>   	}
>   	fclose(f);
> 

Looks good to me.

Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] selftests: vm: Fix resource leak when return error
  2022-06-16 20:11 ` Shuah Khan
@ 2022-06-16 20:19   ` Shuah Khan
  0 siblings, 0 replies; 3+ messages in thread
From: Shuah Khan @ 2022-06-16 20:19 UTC (permalink / raw)
  To: Ding Xiang, akpm, shuah
  Cc: linux-mm, linux-kselftest, linux-kernel, Shuah Khan

On 6/16/22 2:11 PM, Shuah Khan wrote:
> On 6/15/22 3:36 AM, Ding Xiang wrote:
>> When return on an error path, file handle need to be closed
>> to prevent resource leak
>>
>> Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
>> ---
>>   tools/testing/selftests/vm/ksm_tests.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c
>> index 2fcf24312da8..f5e4e0bbd081 100644
>> --- a/tools/testing/selftests/vm/ksm_tests.c
>> +++ b/tools/testing/selftests/vm/ksm_tests.c
>> @@ -54,6 +54,7 @@ static int ksm_write_sysfs(const char *file_path, unsigned long val)
>>       }
>>       if (fprintf(f, "%lu", val) < 0) {
>>           perror("fprintf");
>> +        fclose(f);
>>           return 1;
>>       }
>>       fclose(f);
>> @@ -72,6 +73,7 @@ static int ksm_read_sysfs(const char *file_path, unsigned long *val)
>>       }
>>       if (fscanf(f, "%lu", val) != 1) {
>>           perror("fscanf");
>> +        fclose(f);
>>           return 1;
>>       }
>>       fclose(f);
>>
> 
> Looks good to me.
> 
> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> 

I applied this to linux-kselftest fixes for next rc.

thanks,
-- Shuah

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-06-16 20:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15  9:36 [PATCH] selftests: vm: Fix resource leak when return error Ding Xiang
2022-06-16 20:11 ` Shuah Khan
2022-06-16 20:19   ` Shuah Khan

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).