Skip to contentSkip to conversation

net: sfp: Fix memory leak of hwmon_name on hwmon registration failure

PATCH New Krishan Singh 1 participant 1 message Aug 5

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

PATCH 1/1 net: sfp: Fix memory leak of hwmon_name on hwmon registration failure

hwmon_sanitize_name() allocates sfp->hwmon_name before hwmon_device_register_with_info() is called. If the registration fails, sfp->hwmon_dev is left as an error pointer while sfp->hwmon_name remains allocated.

Later, when the SFP module is removed, sfp_hwmon_remove() is still called. However, it frees sfp->hwmon_name only when !IS_ERR_OR_NULL(sfp->hwmon_dev) is true. Since sfp->hwmon_dev is an error pointer in the failure case, the cleanup block is skipped and hwmon_name is leaked.

Fix this by cleaning up hwmon_name independently of hwmon_dev. Continue to unregister the hwmon device only when hwmon_dev is valid, but free hwmon_name whenever it is a valid allocated pointer.

Fixes 3f118c449c8e ("net: sfp: use hwmon_sanitize_name()")
---
 drivers/net/phy/sfp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/phy/sfp.c +5 -1
index f52020673..f605fb399 100644
@@ -1895,9 +1895,13 @@ static void sfp_hwmon_probe(struct work_struct *work)
 							 sfp->hwmon_name, sfp,
 							 &sfp_hwmon_chip_info,
 							 NULL);
-	if (IS_ERR(sfp->hwmon_dev))
+	if (IS_ERR(sfp->hwmon_dev)) {
 		dev_err(sfp->dev, "failed to register hwmon device: %ld\n",
 			PTR_ERR(sfp->hwmon_dev));
+		kfree(sfp->hwmon_name);
+		sfp->hwmon_name = NULL;
+		sfp->hwmon_dev  = NULL;
+	 }
 }
 
 static int sfp_hwmon_insert(struct sfp *sfp)
Signature · 1 line
2.34.1