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

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

[Yao Dongdong]

Signed-off-by: Yao Dongdong <yaodongdong@huawei.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
---
 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

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

[Yao Dongdong]

result is always zero when comes here.

Signed-off-by: Yao Dongdong <yaodongdong@huawei.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
---
 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

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

[Yao Dongdong]

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

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

[Eduardo Valentin]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

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
> 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]