From: Nicolae Rosia <Nicolae_Rosia@mentor.com>
Date: Tue, 1 Nov 2016 09:49:25 +0000 (+0200)
Subject: ARM: OMAP2+: avoid NULL pointer dereference
X-Git-Tag: v4.9-rc6~2^2~3^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0ab11d8ea46fd6faf67df4461c795091429a1496;p=karo-tx-linux.git

ARM: OMAP2+: avoid NULL pointer dereference

For OMAP4, volt_data is set in omap44xx_voltagedomains_init.
If the SoC is neither OMAP443X or OMAP446X, we end up with a
NULL in volt_data which causes a kernel oops.
This is the case when booting OMAP4470.

Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index cba8cada8c81..cd15dbd62671 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -87,6 +87,12 @@ int voltdm_scale(struct voltagedomain *voltdm,
 		return -ENODATA;
 	}
 
+	if (!voltdm->volt_data) {
+		pr_err("%s: No voltage data defined for vdd_%s\n",
+			__func__, voltdm->name);
+		return -ENODATA;
+	}
+
 	/* Adjust voltage to the exact voltage from the OPP table */
 	for (i = 0; voltdm->volt_data[i].volt_nominal != 0; i++) {
 		if (voltdm->volt_data[i].volt_nominal >= target_volt) {