Skip to contentSkip to conversation

stmmac_dt_phy: null check the allocation

PATCH In review Navid Emamdoost 2 participants 2 messages Jul 23, 2019 – Jul 25, 2019

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

PATCH 1/1 stmmac_dt_phy: null check the allocation

devm_kzalloc may fail and return NULL. So the null check is needed.

---
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +4 -1
index 73fc2524372e..392f8d9539c1 100644
@@ -342,10 +342,13 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat,
 		mdio = true;
 	}
 
-	if (mdio)
+	if (mdio) {
 		plat->mdio_bus_data =
 			devm_kzalloc(dev, sizeof(struct stmmac_mdio_bus_data),
 				     GFP_KERNEL);
+		if (!plat->mdio_bus_data)
+			return -ENOMEM;
+	}
 	return 0;
 }
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw

From: Navid Emamdoost <[email protected]>
Date: Tue, 23 Jul 2019 17:28:09 -0500

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, · line 350

Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +3 -1
@@ -342,10 +342,13 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat,
 		mdio = true;
 	}
 
-	if (mdio)
+	if (mdio) {
 		plat->mdio_bus_data =
 			devm_kzalloc(dev, sizeof(struct stmmac_mdio_bus_data),
 				     GFP_KERNEL);
+		if (!plat->mdio_bus_data)
+			return -ENOMEM;

This leaks a reference to plat->mdio_node() which is acquired in the for_each_child_of_node() loop right before the context here.

This is what I really fear about these automated patches, it is quite often the case that acquired resources are subtly acquired in nearby code and not released by the proposed "fix".

Therefore, either we end up with a regression, or as is the case here a reviewer invests more time into double checking your patch than you put into writing the patch in the first place.