Skip to contentSkip to conversation

omap2430: fix wrong devm_kzalloc() result check

PATCH New Sergei Shtylyov 1 participant 1 message Jan 8, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 omap2430: fix wrong devm_kzalloc() result check

Commit 00a0b1d58af873d842580dcac55f3b156c3a4077 (usb: musb: omap: Add device tree support for omap musb glue) assigns result of devm_kzalloc() call to the 'config' variable but then checks for NULL the 'data' variable (already checked after previous call). Thus we risk a kernel oops further when data pointed by 'config' is written to by subsequent of_property_read_u32() calls iff the allocation happens to fail...

---
This patch is atop of 'musb' branch of Felipe's tree but can also be applied to the 'fixes' branch.

 drivers/usb/musb/omap2430.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/musb/omap2430.c +1 -1
Index: usb/drivers/usb/musb/omap2430.c
===================================================================
@@ -545,7 +545,7 @@ static int __devinit omap2430_probe(stru
 		}
 
 		config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
-		if (!data) {
+		if (!config) {
 			dev_err(&pdev->dev,
 				"failed to allocate musb hdrc config\n");
 			goto err2;

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html