Skip to contentSkip to conversation

82xx: kmalloc failure ignored in ep8248e_mdio_probe()

PATCH Applied Roel Kluin 3 participants 3 messages Sep 9, 2009 – Sep 24, 2009 PowerPC

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 82xx: kmalloc failure ignored in ep8248e_mdio_probe()

Prevent NULL dereference if kmalloc() fails. Also clean up if of_mdiobus_register() returns an error.

Signed-off-by Roel Kluin <[email protected]>

---
Found with sed: http://kernelnewbies.org/roelkluin

Please review.

arch/powerpc/platforms/82xx/ep8248e.c +14 -1
index 51fcae4..f9aee18 100644
@@ -132,12 +132,25 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
 		return -ENOMEM;
 
 	bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+	if (bus->irq == NULL) {
+		ret = -ENOMEM;
+		goto err_free_bus;
+	}
 
 	bus->name = "ep8248e-mdio-bitbang";
 	bus->parent = &ofdev->dev;
 	snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-	return of_mdiobus_register(bus, ofdev->node);
+	ret = of_mdiobus_register(bus, ofdev->node);
+	if (ret)
+		goto err_free_irq;
+
+	return 0;
+err_free_irq:
+	kfree(bus->irq);
+err_free_bus:
+	free_mdio_bitbang(bus);
+	return ret;
 }
 
 static int ep8248e_mdio_remove(struct of_device *ofdev)