RE: [PATCH v3] pinctrl: thunderbay: fix possible memory leak in thunderbay_build_functions()

["D, Lakshmi Sowjanya" <lakshmi.sowjanya.d@xxxxxxxxx>]

> -----Original Message-----
> From: Gaosheng Cui <cuigaosheng1@xxxxxxxxxx>
> Sent: Tuesday, November 29, 2022 5:31 PM
> To: D, Lakshmi Sowjanya <lakshmi.sowjanya.d@xxxxxxxxx>;
> linus.walleij@xxxxxxxxxx; S, Kiran Kumar1 <kiran.kumar1.s@xxxxxxxxx>;
> rafal@xxxxxxxxxx; cuigaosheng1@xxxxxxxxxx
> Cc: linux-gpio@xxxxxxxxxxxxxxx
> Subject: [PATCH v3] pinctrl: thunderbay: fix possible memory leak in
> thunderbay_build_functions()
> 
> The thunderbay_add_functions() will free memory of thunderbay_funcs
> when everything is ok, but thunderbay_funcs will not be freed when
> thunderbay_add_functions() fails, then there will be a memory leak, so we
> need to add kfree() when thunderbay_add_functions() fails to fix it.
> 
> In addition, doing some cleaner works, moving kfree(funcs) from
> thunderbay_add_functions() to thunderbay_build_functions().
> 
> Fixes: 12422af8194d ("pinctrl: Add Intel Thunder Bay pinctrl driver")
> Signed-off-by: Gaosheng Cui <cuigaosheng1@xxxxxxxxxx>
> ---
> v3:
> - Doing some cleaner works, moving kfree(funcs) from
> thunderbay_add_functions()
>   to thunderbay_build_functions(), and update the commit message, thanks!
> v2:
> - Free the memory in thunderbay_build_functions, and update the commit
>   message and the fixes tag, thanks!
>  drivers/pinctrl/pinctrl-thunderbay.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-thunderbay.c b/drivers/pinctrl/pinctrl-
> thunderbay.c
> index 9328b17485cf..590bbbf619af 100644
> --- a/drivers/pinctrl/pinctrl-thunderbay.c
> +++ b/drivers/pinctrl/pinctrl-thunderbay.c
> @@ -808,7 +808,7 @@ static int thunderbay_add_functions(struct
> thunderbay_pinctrl *tpc, struct funct
>  					    funcs[i].num_group_names,
>  					    funcs[i].data);
>  	}
> -	kfree(funcs);
> +
>  	return 0;
>  }
> 
> @@ -817,6 +817,7 @@ static int thunderbay_build_functions(struct
> thunderbay_pinctrl *tpc)
>  	struct function_desc *thunderbay_funcs;
>  	void *ptr;
>  	int pin;
> +	int ret;
> 
>  	/*
>  	 * Allocate maximum possible number of functions. Assume every
> pin @@ -860,7 +861,10 @@ static int thunderbay_build_functions(struct
> thunderbay_pinctrl *tpc)
>  		return -ENOMEM;
> 
>  	thunderbay_funcs = ptr;
> -	return thunderbay_add_functions(tpc, thunderbay_funcs);
> +	ret = thunderbay_add_functions(tpc, thunderbay_funcs);
> +
> +	kfree(thunderbay_funcs);
> +	return ret;
>  }
> 
>  static int thunderbay_pinconf_set_tristate(struct thunderbay_pinctrl *tpc,
> --
> 2.25.1
 
Thanks for the changes suggested, but pinctrl-thunderbay.c file will soon be removed from opensource kernel

Regards
Lakshmi Sowjanya D