Commit 87260d3f authored Apr 21, 2016 by Dirk Behme Committed by Zhang Rui Sep 06, 2016

thermal: rcar_thermal: Fix priv->zone error handling



In case thermal_zone_xxx_register() returns an error, priv->zone
isn't NULL any more, but contains the error code.

This is passed to thermal_zone_device_unregister(), then. This checks
for priv->zone being NULL, but the error code is != NULL. So it works
with the error code as a pointer. Crashing immediately.

To fix this, reset priv->zone to NULL before entering
rcar_gen3_thermal_remove().

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>

parent c6935931

drivers/thermal/rcar_thermal.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -504,6 +504,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
		if (IS_ERR(priv->zone)) {
		dev_err(dev, "can't register thermal zone\n");
		ret = PTR_ERR(priv->zone);
		priv->zone = NULL;
		goto error_unregister;
		}