Skip to contentSkip to conversation

PPC: Fix potential NULL dereference

PATCH Applied Cyrill Gorcunov 2 participants 2 messages Nov 15, 2007 – Nov 20, 2007

Subsystems (2)
PowerPC Linux for PowerPC embedded PPC8XX and PPC83XX
lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

PATCH 1/1 PPC: Fix potential NULL dereference

This patch does fix potential NULL pointer dereference that could take place inside of strcmp() if of_get_property() call failed.

Signed-off-by Cyrill Gorcunov <[email protected]>

---

 arch/powerpc/platforms/83xx/usb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/platforms/83xx/usb.c +4 -4
index eafe760..b45160f 100644
@@ -130,7 +130,7 @@ int mpc831x_usb_cfg(void)
 	out_be32(immap + MPC83XX_SCCR_OFFS, temp);
 
 	/* Configure pin mux for ULPI.  There is no pin mux for UTMI */
-	if (!strcmp(prop, "ulpi")) {
+	if (prop && !strcmp(prop, "ulpi")) {
 		temp = in_be32(immap + MPC83XX_SICRL_OFFS);
 		temp &= ~MPC831X_SICRL_USB_MASK;
 		temp |= MPC831X_SICRL_USB_ULPI;

@@ -153,13 +153,13 @@ int mpc831x_usb_cfg(void)
 	usb_regs = ioremap(res.start, res.end - res.start + 1);
 
 	/* Using on-chip PHY */
-	if (!strcmp(prop, "utmi_wide") ||
-			!strcmp(prop, "utmi")) {
+	if (prop && (!strcmp(prop, "utmi_wide") ||
+		     !strcmp(prop, "utmi"))) {
 		/* Set UTMI_PHY_EN, REFSEL to 48MHZ */
 		out_be32(usb_regs + FSL_USB2_CONTROL_OFFS,
 				CONTROL_UTMI_PHY_EN | CONTROL_REFSEL_48MHZ);
 	/* Using external UPLI PHY */
-	} else if (!strcmp(prop, "ulpi")) {
+	} else if (prop && !strcmp(prop, "ulpi")) {
 		/* Set PHY_CLK_SEL to ULPI */
 		temp = CONTROL_PHY_CLK_SEL_ULPI;
 #ifdef CONFIG_USB_OTG
Applied
#1 lore raw
Quoted 10 lines · Cyrill Gorcunov

This patch does fix potential NULL pointer dereference that could take place inside of strcmp() if of_get_property() call failed.

Signed-off-by Cyrill Gorcunov <[email protected]>

---

 arch/powerpc/platforms/83xx/usb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

CC the [email protected] list in the future.

applied.

- k