2014-10-28 07:24:22

by Yao Dongdong

[permalink] [raw]
Subject: [PATCH 1/2 resend] Thermal:Fix memory leak if occur goto unregister

Signed-off-by: Yao Dongdong <[email protected]>
Acked-by: Eduardo Valentin <[email protected]>
---
drivers/thermal/thermal_core.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 9bf10aa..d358605 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1581,6 +1581,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
unregister:
release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
device_unregister(&tz->device);
+ kfree(tz);
return ERR_PTR(result);
}
EXPORT_SYMBOL_GPL(thermal_zone_device_register);
--
1.8.3.4


2014-10-28 07:24:21

by Yao Dongdong

[permalink] [raw]
Subject: [PATCH 2/2 resend] Thermal:Remove usless if(!result) before return tz

result is always zero when comes here.

Signed-off-by: Yao Dongdong <[email protected]>
Acked-by: Eduardo Valentin <[email protected]>
---
drivers/thermal/thermal_core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index d358605..a438c95 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1575,8 +1575,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,

thermal_zone_device_update(tz);

- if (!result)
- return tz;
+ return tz;

unregister:
release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
--
1.8.3.4

2014-10-28 08:11:32

by Yao Dongdong

[permalink] [raw]
Subject: Re: [PATCH 1/2 resend] Thermal:Fix memory leak if occur goto unregister

Hello Eduardo,

I'm sorry for that my patches listed below have format problems, so i resend them.

https://lkml.org/lkml/2014/10/20/85
https://lkml.org/lkml/2014/10/20/84

Thanks,
Yao Dongdong

2014-10-29 00:52:00

by Eduardo Valentin

[permalink] [raw]
Subject: Re: [PATCH 1/2 resend] Thermal:Fix memory leak if occur goto unregister

On Tue, Oct 28, 2014 at 04:11:00PM +0800, Yao Dongdong wrote:
> Hello Eduardo,
>
> I'm sorry for that my patches listed below have format problems, so i resend them.
>
> https://lkml.org/lkml/2014/10/20/85
> https://lkml.org/lkml/2014/10/20/84

No issues. Thanks. I will apply them in my tree.

>
> Thanks,
> Yao Dongdong
>

Attachments:
(No filename) (328.00 B)
 signature.asc (473.00 B)
Digital signature Download all attachments