2019-07-25 13:58:44

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH] mfd: max77620: Add of_node_put() before return

On Tue, 09 Jul 2019, Nishka Dasgupta wrote:

> Each iteration of for_each_child_of_node puts the previous node, but in
> the case of a return from the middle of the loop, there is no put, thus
> causing a memory leak. Hence add an of_node_put before the return.
> Issue found with Coccinelle.
>
> Signed-off-by: Nishka Dasgupta <[email protected]>
> ---
> drivers/mfd/max77620.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)

Ah, I've just seen that you didn't send this to the list.

When submitting patches upstream, you must CC at least one list.

Usually people CC LKML as a matter of course.

I've CC'ed LMKL here and applied the patch.

> diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
> index 0c28965fcc6a..a851ff473a44 100644
> --- a/drivers/mfd/max77620.c
> +++ b/drivers/mfd/max77620.c
> @@ -416,8 +416,10 @@ static int max77620_initialise_fps(struct max77620_chip *chip)
>
> for_each_child_of_node(fps_np, fps_child) {
> ret = max77620_config_fps(chip, fps_child);
> - if (ret < 0)
> + if (ret < 0) {
> + of_node_put(fps_child);
> return ret;
> + }
> }
>
> config = chip->enable_global_lpm ? MAX77620_ONOFFCNFG2_SLP_LPM_MSK : 0;

--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog


2019-07-26 08:14:41

by Nishka Dasgupta

[permalink] [raw]
Subject: Re: [PATCH] mfd: max77620: Add of_node_put() before return

On 25/07/19 5:45 PM, Lee Jones wrote:
> On Tue, 09 Jul 2019, Nishka Dasgupta wrote:
>
>> Each iteration of for_each_child_of_node puts the previous node, but in
>> the case of a return from the middle of the loop, there is no put, thus
>> causing a memory leak. Hence add an of_node_put before the return.
>> Issue found with Coccinelle.
>>
>> Signed-off-by: Nishka Dasgupta <[email protected]>
>> ---
>> drivers/mfd/max77620.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> Ah, I've just seen that you didn't send this to the list.
>
> When submitting patches upstream, you must CC at least one list.
>
> Usually people CC LKML as a matter of course.

My mistake, sorry. I'll CC the list from next time.

Thanking you,
Nishka
>
> I've CC'ed LMKL here and applied the patch.
>
>> diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
>> index 0c28965fcc6a..a851ff473a44 100644
>> --- a/drivers/mfd/max77620.c
>> +++ b/drivers/mfd/max77620.c
>> @@ -416,8 +416,10 @@ static int max77620_initialise_fps(struct max77620_chip *chip)
>>
>> for_each_child_of_node(fps_np, fps_child) {
>> ret = max77620_config_fps(chip, fps_child);
>> - if (ret < 0)
>> + if (ret < 0) {
>> + of_node_put(fps_child);
>> return ret;
>> + }
>> }
>>
>> config = chip->enable_global_lpm ? MAX77620_ONOFFCNFG2_SLP_LPM_MSK : 0;
>