[PATCH 4.15 106/168] thermal: int3400_thermal: fix error handling in int3400_thermal_probe()

[Greg Kroah-Hartman]

4.15-stable review patch.  If anyone has any objections, please let me know.

--

From: Alexey Khoroshilov 


[ Upstream commit 0be86969ae385c5c944286bd9f66068525de15ee ]

There are resources that are not dealocated on failure path
in int3400_thermal_probe().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov 
Signed-off-by: Zhang Rui 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/thermal/int340x_thermal/int3400_thermal.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
@@ -319,17 +319,21 @@ static int int3400_thermal_probe(struct
 
result = sysfs_create_group(>dev.kobj, _attribute_group);
if (result)
-   goto free_zone;
+   goto free_rel_misc;
 
result = acpi_install_notify_handler(
priv->adev->handle, ACPI_DEVICE_NOTIFY, int3400_notify,
(void *)priv);
if (result)
-   goto free_zone;
+   goto free_sysfs;
 
return 0;
 
-free_zone:
+free_sysfs:
+   sysfs_remove_group(>dev.kobj, _attribute_group);
+free_rel_misc:
+   if (!priv->rel_misc_dev_res)
+   acpi_thermal_rel_misc_device_remove(priv->adev->handle);
thermal_zone_device_unregister(priv->thermal);
 free_art_trt:
kfree(priv->trts);

[PATCH 4.15 106/168] thermal: int3400_thermal: fix error handling in int3400_thermal_probe()

[Greg Kroah-Hartman]

4.15-stable review patch.  If anyone has any objections, please let me know.

--

From: Alexey Khoroshilov 


[ Upstream commit 0be86969ae385c5c944286bd9f66068525de15ee ]

There are resources that are not dealocated on failure path
in int3400_thermal_probe().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov 
Signed-off-by: Zhang Rui 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 drivers/thermal/int340x_thermal/int3400_thermal.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
@@ -319,17 +319,21 @@ static int int3400_thermal_probe(struct
 
result = sysfs_create_group(>dev.kobj, _attribute_group);
if (result)
-   goto free_zone;
+   goto free_rel_misc;
 
result = acpi_install_notify_handler(
priv->adev->handle, ACPI_DEVICE_NOTIFY, int3400_notify,
(void *)priv);
if (result)
-   goto free_zone;
+   goto free_sysfs;
 
return 0;
 
-free_zone:
+free_sysfs:
+   sysfs_remove_group(>dev.kobj, _attribute_group);
+free_rel_misc:
+   if (!priv->rel_misc_dev_res)
+   acpi_thermal_rel_misc_device_remove(priv->adev->handle);
thermal_zone_device_unregister(priv->thermal);
 free_art_trt:
kfree(priv->trts);