thermal: rcar_thermal: avoid NULL dereference in absence of IRQ resources

horms · Eduardo Valentin · commit 542cdf406804 · 2018-07-27T16:45:36.000-07:00
Ensure that the base address used by a call to rcar_thermal_common_write() may be NULL if the SOC supports interrupts for use with the thermal device but none are defined in DT as is the case for R-Car H1 (r8a7779). Guard against this condition to prevent a NULL dereference when the device is probed. Tested on: * R-Mobile APE6 (r8a73a4) / APE6EVM * R-Car H1 (r8a7779) / Marzen * R-Car H2 (r8a7790) / Lager * R-Car M2-W (r8a7791) / Koelsch * R-Car M2-N (r8a7793) / Gose * R-Car D3 ES1.0 (r8a77995) / Draak Fixes: 1969d9d ("thermal: rcar_thermal: add r8a77995 support") Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
@@ -598,7 +598,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 			enr_bits |= 3 << (i * 8);
 	}
 
-	if (enr_bits)
+	if (common->base && enr_bits)
 		rcar_thermal_common_write(common, ENR, enr_bits);
 
 	dev_info(dev, "%d sensor probed\n", i);

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)`
`598`	`598`	`enr_bits \|= 3 << (i * 8);`
`599`	`599`	`}`
`600`	`600`
`601`		`- if (enr_bits)`
	`601`	`+ if (common->base && enr_bits)`
`602`	`602`	`rcar_thermal_common_write(common, ENR, enr_bits);`
`603`	`603`
`604`	`604`	`dev_info(dev, "%d sensor probed\n", i);`