ab3100-otp: fix memory leak in ab3100_otp_probe

ab3100-otp: fix memory leak in ab3100_otp_probe

[Axel Lin]

In current implementation, there is a memory leak if ab3100_otp_read fail.
And in the case of ab3100_otp_init_debugfs fail, it does not properly remove
sysfs entries.
This patch properly handle above failure cases.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/mfd/ab3100-otp.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c
index 2d14655..939b876 100644
--- a/drivers/mfd/ab3100-otp.c
+++ b/drivers/mfd/ab3100-otp.c
@@ -202,7 +202,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
 
 	err = ab3100_otp_read(otp);
 	if (err)
-		return err;
+		goto err_otp_read;
 
 	dev_info(&pdev->dev, "AB3100 OTP readout registered\n");
 
@@ -211,21 +211,21 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
 		err = device_create_file(&pdev->dev,
 					 &ab3100_otp_attrs[i]);
 		if (err)
-			goto out_no_sysfs;
+			goto err_create_file;
 	}
 
 	/* debugfs entries */
 	err = ab3100_otp_init_debugfs(&pdev->dev, otp);
 	if (err)
-		goto out_no_debugfs;
+		goto err_init_debugfs;
 
 	return 0;
 
-out_no_sysfs:
-	for (i = 0; i < ARRAY_SIZE(ab3100_otp_attrs); i++)
-		device_remove_file(&pdev->dev,
-				   &ab3100_otp_attrs[i]);
-out_no_debugfs:
+err_init_debugfs:
+err_create_file:
+	while (--i >= 0)
+		device_remove_file(&pdev->dev, &ab3100_otp_attrs[i]);
+err_otp_read:
 	kfree(otp);
 	return err;
 }
-- 
1.5.4.3

RE: ab3100-otp: fix memory leak in ab3100_otp_probe

[Linus WALLEIJ]

[Axel]

> In current implementation, there is a memory leak if ab3100_otp_read fail.
> And in the case of ab3100_otp_init_debugfs fail, it does not properly
> remove
> sysfs entries.
> This patch properly handle above failure cases.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Acked-by: Linus Walleij <linus.walleij@stericsson.com>

Thanks for fixing this!

Yours,
Linus Walleij

Re: ab3100-otp: fix memory leak in ab3100_otp_probe

[Samuel Ortiz]

Hi Axel,

On Tue, May 25, 2010 at 02:49:51PM +0800, Axel Lin wrote:
> In current implementation, there is a memory leak if ab3100_otp_read fail.
> And in the case of ab3100_otp_init_debugfs fail, it does not properly remove
> sysfs entries.
> This patch properly handle above failure cases.
Patch applied, thanks a lot.

Cheers,
Samuel.


> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
>  drivers/mfd/ab3100-otp.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c
> index 2d14655..939b876 100644
> --- a/drivers/mfd/ab3100-otp.c
> +++ b/drivers/mfd/ab3100-otp.c
> @@ -202,7 +202,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
>  
>  	err = ab3100_otp_read(otp);
>  	if (err)
> -		return err;
> +		goto err_otp_read;
>  
>  	dev_info(&pdev->dev, "AB3100 OTP readout registered\n");
>  
> @@ -211,21 +211,21 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
>  		err = device_create_file(&pdev->dev,
>  					 &ab3100_otp_attrs[i]);
>  		if (err)
> -			goto out_no_sysfs;
> +			goto err_create_file;
>  	}
>  
>  	/* debugfs entries */
>  	err = ab3100_otp_init_debugfs(&pdev->dev, otp);
>  	if (err)
> -		goto out_no_debugfs;
> +		goto err_init_debugfs;
>  
>  	return 0;
>  
> -out_no_sysfs:
> -	for (i = 0; i < ARRAY_SIZE(ab3100_otp_attrs); i++)
> -		device_remove_file(&pdev->dev,
> -				   &ab3100_otp_attrs[i]);
> -out_no_debugfs:
> +err_init_debugfs:
> +err_create_file:
> +	while (--i >= 0)
> +		device_remove_file(&pdev->dev, &ab3100_otp_attrs[i]);
> +err_otp_read:
>  	kfree(otp);
>  	return err;
>  }
> -- 
> 1.5.4.3
> 
> 
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/