Skip to contentSkip to conversation

stmmac: handle allocation errors in setup functions

PATCH Applied Dan Carpenter 2 participants 2 messages Jul 22, 2010

Subsystems (4)
Networking Network drivers Kernel janitors Arm STM32
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 stmmac: handle allocation errors in setup functions

If the allocations fail in either dwmac1000_setup() or dwmac100_setup() then return NULL. These are called from stmmac_mac_device_setup(). The check for NULL returns in stmmac_mac_device_setup() needed to be moved forward a couple lines.

Signed-off-by Dan Carpenter <[email protected]>
drivers/net/stmmac/dwmac1000_core.c +2 -0
index 917b4e1..2b2f5c8 100644
@@ -220,6 +220,8 @@ struct mac_device_info *dwmac1000_setup(unsigned long ioaddr)
 		((uid & 0x0000ff00) >> 8), (uid & 0x000000ff));
 
 	mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL);
+	if (!mac)
+		return NULL;
 
 	mac->mac = &dwmac1000_ops;
 	mac->dma = &dwmac1000_dma_ops;
drivers/net/stmmac/dwmac100_core.c +2 -0
index 6f270a0..2fb165f 100644
@@ -179,6 +179,8 @@ struct mac_device_info *dwmac100_setup(unsigned long ioaddr)
 	struct mac_device_info *mac;
 
 	mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL);
+	if (!mac)
+		return NULL;
 
 	pr_info("\tDWMAC100\n");
drivers/net/stmmac/stmmac_main.c +3 -3
index acf0616..0bdd332 100644
@@ -1558,15 +1558,15 @@ static int stmmac_mac_device_setup(struct net_device *dev)
 	else
 		device = dwmac100_setup(ioaddr);
 
+	if (!device)
+		return -ENOMEM;
+
 	if (priv->enh_desc) {
 		device->desc = &enh_desc_ops;
 		pr_info("\tEnhanced descriptor structure\n");
 	} else
 		device->desc = &ndesc_ops;
 
-	if (!device)
-		return -ENOMEM;
-
 	priv->hw = device;
 
 	priv->wolenabled = priv->hw->pmt;	/* PMT supported */
maintainer Applied
#1 lore raw

From: Dan Carpenter <[email protected]>
Date: Thu, 22 Jul 2010 13:16:48 +0200

Quoted 6 lines

If the allocations fail in either dwmac1000_setup() or dwmac100_setup() then return NULL. These are called from stmmac_mac_device_setup(). The check for NULL returns in stmmac_mac_device_setup() needed to be moved forward a couple lines.

Signed-off-by Dan Carpenter <[email protected]>

Applied.