scripts/sorttable: Fix resource leak on file pointer fp

[PATCH][next] scripts/sorttable: Fix resource leak on file pointer fp

Posted by Colin Ian King 11 months, 2 weeks ago

There is a resource leak on fp on an error return path in function
parse_symbols that causes a resource leak. Fix this by adding in
the missing fclose.

Fixes: ef378c3b8233 ("scripts/sorttable: Zero out weak functions in mcount_loc table")
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 scripts/sorttable.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/sorttable.c b/scripts/sorttable.c
index 7b4b3714b1af..e35abf28d037 100644
--- a/scripts/sorttable.c
+++ b/scripts/sorttable.c
@@ -665,8 +665,10 @@ static int parse_symbols(const char *fname)
 
 		addr = strtoull(addr_str, NULL, 16);
 		size = strtoull(size_str, NULL, 16);
-		if (add_field(addr, size) < 0)
+		if (add_field(addr, size) < 0) {
+			fclose(fp);
 			return -1;
+		}
 	}
 	fclose(fp);
 
-- 
2.47.2

Re: [PATCH][next] scripts/sorttable: Fix resource leak on file pointer fp

Posted by Dan Carpenter 11 months, 2 weeks ago

On Wed, Feb 26, 2025 at 10:49:34PM +0000, Colin Ian King wrote:
> There is a resource leak on fp on an error return path in function
> parse_symbols that causes a resource leak. Fix this by adding in
> the missing fclose.
> 
> Fixes: ef378c3b8233 ("scripts/sorttable: Zero out weak functions in mcount_loc table")
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

This is in scripts/ so it doesn't really matter.  We're going to exit
and release everything immediately either way.

regards,
dan carpenter

Re: [PATCH][next] scripts/sorttable: Fix resource leak on file pointer fp

Posted by Colin King (gmail) 11 months, 2 weeks ago

On 27/02/2025 09:57, Dan Carpenter wrote:
> On Wed, Feb 26, 2025 at 10:49:34PM +0000, Colin Ian King wrote:
>> There is a resource leak on fp on an error return path in function
>> parse_symbols that causes a resource leak. Fix this by adding in
>> the missing fclose.
>>
>> Fixes: ef378c3b8233 ("scripts/sorttable: Zero out weak functions in mcount_loc table")
>> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> 
> This is in scripts/ so it doesn't really matter.  We're going to exit
> and release everything immediately either way.

Ack. Won't fix these issues in scripts in future.

> 
> regards,
> dan carpenter
>

Re: [PATCH][next] scripts/sorttable: Fix resource leak on file pointer fp

Posted by Steven Rostedt 11 months, 2 weeks ago

On Wed, 26 Feb 2025 22:49:34 +0000
Colin Ian King <colin.i.king@gmail.com> wrote:

> There is a resource leak on fp on an error return path in function
> parse_symbols that causes a resource leak. Fix this by adding in
> the missing fclose.

This patch has already been sent, and it's not really a leak, as when this
returns -1, it causes the program to exit and that will close all file descriptors.

I said I'll take the other patch as a clean up though.

  https://lore.kernel.org/all/20250225053724.74582-1-dheeraj.linuxdev@gmail.com/

-- Steve


> 
> Fixes: ef378c3b8233 ("scripts/sorttable: Zero out weak functions in mcount_loc table")
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>  scripts/sorttable.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/sorttable.c b/scripts/sorttable.c
> index 7b4b3714b1af..e35abf28d037 100644
> --- a/scripts/sorttable.c
> +++ b/scripts/sorttable.c
> @@ -665,8 +665,10 @@ static int parse_symbols(const char *fname)
>  
>  		addr = strtoull(addr_str, NULL, 16);
>  		size = strtoull(size_str, NULL, 16);
> -		if (add_field(addr, size) < 0)
> +		if (add_field(addr, size) < 0) {
> +			fclose(fp);
>  			return -1;
> +		}
>  	}
>  	fclose(fp);
>