[01/12] PM / devfreq: Fix memory leak when fail to register device
diff mbox

Message ID 1503538979-22693-2-git-send-email-cw00.choi@samsung.com
State Deferred
Headers show

Commit Message

Chanwoo Choi Aug. 24, 2017, 1:42 a.m. UTC
When the devfreq_add_device fails to register deivce, the memory
leak of devfreq instance happen. So, this patch fix the memory
leak issue. Before freeing the devfreq instance checks whether
devfreq instance is NULL or not because the device_unregister()
frees the devfreq instance when jumping to the 'err_init'.
It is to prevent the duplicate the kfee(devfreq).

Cc: stable@vger.kernel.org
Fixes: ac4b281176a5 ("PM / devfreq: fix duplicated kfree on devfreq pointer")
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 drivers/devfreq/devfreq.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

MyungJoo Ham Aug. 28, 2017, 12:17 a.m. UTC | #1
> When the devfreq_add_device fails to register deivce, the memory
> leak of devfreq instance happen. So, this patch fix the memory
> leak issue. Before freeing the devfreq instance checks whether
> devfreq instance is NULL or not because the device_unregister()
> frees the devfreq instance when jumping to the 'err_init'.
> It is to prevent the duplicate the kfee(devfreq).
> 
> Cc: stable@vger.kernel.org
> Fixes: ac4b281176a5 ("PM / devfreq: fix duplicated kfree on devfreq pointer")
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
>  drivers/devfreq/devfreq.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

This looks like to be duplicated. Please check your repo basis.


Cheers,
MyungJoo

> 
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index dea04871b50d..a1c4ee818614 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -564,7 +564,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
>  	err = device_register(&devfreq->dev);
>  	if (err) {
>  		mutex_unlock(&devfreq->lock);
> -		goto err_out;
> +		goto err_dev;
>  	}
>  
>  	devfreq->trans_table =	devm_kzalloc(&devfreq->dev,
> @@ -610,6 +610,9 @@ struct devfreq *devfreq_add_device(struct device *dev,
>  	mutex_unlock(&devfreq_list_lock);
>  
>  	device_unregister(&devfreq->dev);
> +err_dev:
> +	if (devfreq)
> +		kfree(devfreq);
>  err_out:
>  	return ERR_PTR(err);
>  }
> -- 
> 1.9.1
Chanwoo Choi Aug. 28, 2017, 12:23 a.m. UTC | #2
On 2017년 08월 28일 09:17, MyungJoo Ham wrote:
>> When the devfreq_add_device fails to register deivce, the memory
>> leak of devfreq instance happen. So, this patch fix the memory
>> leak issue. Before freeing the devfreq instance checks whether
>> devfreq instance is NULL or not because the device_unregister()
>> frees the devfreq instance when jumping to the 'err_init'.
>> It is to prevent the duplicate the kfee(devfreq).
>>
>> Cc: stable@vger.kernel.org
>> Fixes: ac4b281176a5 ("PM / devfreq: fix duplicated kfree on devfreq pointer")
>> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
>> ---
>>  drivers/devfreq/devfreq.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> This looks like to be duplicated. Please check your repo basis.

These patches is based on the v4.13-rc6.

After merged ("PM / devfreq: fix duplicated kfree on devfreq pointer"),
this patch doesn't consider the free of memory when error case.

After applying this patch, this patch consider the error case
when jumping the err_dev statement with goto.
		device_unregister(&devfreq->dev);
	err_dev:
		if (devfreq)		
			kfree(devfreq);


> 
> 
> Cheers,
> MyungJoo
> 
>>
>> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
>> index dea04871b50d..a1c4ee818614 100644
>> --- a/drivers/devfreq/devfreq.c
>> +++ b/drivers/devfreq/devfreq.c
>> @@ -564,7 +564,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
>>  	err = device_register(&devfreq->dev);
>>  	if (err) {
>>  		mutex_unlock(&devfreq->lock);
>> -		goto err_out;
>> +		goto err_dev;
>>  	}
>>  
>>  	devfreq->trans_table =	devm_kzalloc(&devfreq->dev,
>> @@ -610,6 +610,9 @@ struct devfreq *devfreq_add_device(struct device *dev,
>>  	mutex_unlock(&devfreq_list_lock);
>>  
>>  	device_unregister(&devfreq->dev);
>> +err_dev:
>> +	if (devfreq)
>> +		kfree(devfreq);
>>  err_out:
>>  	return ERR_PTR(err);
>>  }
>> -- 
>> 1.9.1
> 
>
MyungJoo Ham Aug. 28, 2017, 1:30 a.m. UTC | #3
> On 2017년 08월 28일 09:17, MyungJoo Ham wrote:
> >> When the devfreq_add_device fails to register deivce, the memory
> >> leak of devfreq instance happen. So, this patch fix the memory
> >> leak issue. Before freeing the devfreq instance checks whether
> >> devfreq instance is NULL or not because the device_unregister()
> >> frees the devfreq instance when jumping to the 'err_init'.
> >> It is to prevent the duplicate the kfee(devfreq).
> >>
> >> Cc: stable@vger.kernel.org
> >> Fixes: ac4b281176a5 ("PM / devfreq: fix duplicated kfree on devfreq pointer")
> >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> >> ---
> >>  drivers/devfreq/devfreq.c | 5 ++++-
> >>  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > This looks like to be duplicated. Please check your repo basis.
> 
> These patches is based on the v4.13-rc6.
> 
> After merged ("PM / devfreq: fix duplicated kfree on devfreq pointer"),
> this patch doesn't consider the free of memory when error case.
> 
> After applying this patch, this patch consider the error case
> when jumping the err_dev statement with goto.
> 		device_unregister(&devfreq->dev);
> 	err_dev:
> 		if (devfreq)		
> 			kfree(devfreq);

Ah sorry. It looks like I was confused of - and + somehow.

Acked-By: MyungJoo Ham.

(I'll merge trivial fixes first)

> 
>

Patch
diff mbox

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index dea04871b50d..a1c4ee818614 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -564,7 +564,7 @@  struct devfreq *devfreq_add_device(struct device *dev,
 	err = device_register(&devfreq->dev);
 	if (err) {
 		mutex_unlock(&devfreq->lock);
-		goto err_out;
+		goto err_dev;
 	}
 
 	devfreq->trans_table =	devm_kzalloc(&devfreq->dev,
@@ -610,6 +610,9 @@  struct devfreq *devfreq_add_device(struct device *dev,
 	mutex_unlock(&devfreq_list_lock);
 
 	device_unregister(&devfreq->dev);
+err_dev:
+	if (devfreq)
+		kfree(devfreq);
 err_out:
 	return ERR_PTR(err);
 }