2021-03-15 09:33:36

by Lukasz Luba

Subject: [PATCH v2] PM / devfreq: Unlock mutex and free devfreq struct in error path

The devfreq->lock is held for time of setup. Release the lock in the
error path, before jumping to the end of the function.

Change the goto destination which frees the allocated memory.

Cc: v5.9+ <[email protected]> # v5.9+
Fixes: 4dc3bab8687f ("PM / devfreq: Add support delayed timer for polling mode")
Signed-off-by: Lukasz Luba <[email protected]>
---
v2:
- added fixes tag and CC stable v5.9+
- used capital letter in commit header


drivers/devfreq/devfreq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index b6d3e7db0b09..99b2eeedc238 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -822,7 +822,8 @@ struct devfreq *devfreq_add_device(struct device *dev,

if (devfreq->profile->timer < 0
|| devfreq->profile->timer >= DEVFREQ_TIMER_NUM) {
- goto err_out;
+ mutex_unlock(&devfreq->lock);
+ goto err_dev;
}

if (!devfreq->profile->max_state && !devfreq->profile->freq_table) {
--
2.17.1

2021-03-15 09:40:16

by Chanwoo Choi

Subject: Re: [PATCH v2] PM / devfreq: Unlock mutex and free devfreq struct in error path

On 3/15/21 6:31 PM, Lukasz Luba wrote:
> The devfreq->lock is held for time of setup. Release the lock in the
> error path, before jumping to the end of the function.
>
> Change the goto destination which frees the allocated memory.
>
> Cc: v5.9+ <[email protected]> # v5.9+
> Fixes: 4dc3bab8687f ("PM / devfreq: Add support delayed timer for polling mode")
> Signed-off-by: Lukasz Luba <[email protected]>
> ---
> v2:
> - added fixes tag and CC stable v5.9+
> - used capital letter in commit header
>
>
> drivers/devfreq/devfreq.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index b6d3e7db0b09..99b2eeedc238 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -822,7 +822,8 @@ struct devfreq *devfreq_add_device(struct device *dev,
>
> if (devfreq->profile->timer < 0
> || devfreq->profile->timer >= DEVFREQ_TIMER_NUM) {
> - goto err_out;
> + mutex_unlock(&devfreq->lock);
> + goto err_dev;
> }
>
> if (!devfreq->profile->max_state && !devfreq->profile->freq_table) {
>


Applied it. Thanks.

--
Best Regards,
Chanwoo Choi
Samsung Electronics

2021-03-15 10:03:09

by Lukasz Luba

Subject: Re: [PATCH v2] PM / devfreq: Unlock mutex and free devfreq struct in error path

On 3/15/21 9:54 AM, Chanwoo Choi wrote:
> On 3/15/21 6:31 PM, Lukasz Luba wrote:
>> The devfreq->lock is held for time of setup. Release the lock in the
>> error path, before jumping to the end of the function.
>>
>> Change the goto destination which frees the allocated memory.
>>
>> Cc: v5.9+ <[email protected]> # v5.9+
>> Fixes: 4dc3bab8687f ("PM / devfreq: Add support delayed timer for polling mode")
>> Signed-off-by: Lukasz Luba <[email protected]>
>> ---
>> v2:
>> - added fixes tag and CC stable v5.9+
>> - used capital letter in commit header
>>
>>
>> drivers/devfreq/devfreq.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
>> index b6d3e7db0b09..99b2eeedc238 100644
>> --- a/drivers/devfreq/devfreq.c
>> +++ b/drivers/devfreq/devfreq.c
>> @@ -822,7 +822,8 @@ struct devfreq *devfreq_add_device(struct device *dev,
>>
>> if (devfreq->profile->timer < 0
>> || devfreq->profile->timer >= DEVFREQ_TIMER_NUM) {
>> - goto err_out;
>> + mutex_unlock(&devfreq->lock);
>> + goto err_dev;
>> }
>>
>> if (!devfreq->profile->max_state && !devfreq->profile->freq_table) {
>>
>
>
> Applied it. Thanks.
>

Thank you Chanwoo!

Regards,
Lukasz