Skip to content

Commit 6330002

Browse files
joehattorismb49
authored andcommitted
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
BugLink: https://bugs.launchpad.net/bugs/2078428 [ Upstream commit e386209 ] bcm_sf2_mdio_register() calls of_phy_find_device() and then phy_device_remove() in a loop to remove existing PHY devices. of_phy_find_device() eventually calls bus_find_device(), which calls get_device() on the returned struct device * to increment the refcount. The current implementation does not decrement the refcount, which causes memory leak. This commit adds the missing phy_device_free() call to decrement the refcount via put_device() to balance the refcount. Fixes: 771089c ("net: dsa: bcm_sf2: Ensure that MDIO diversion is used") Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp> Tested-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Link: https://patch.msgid.link/20240806011327.3817861-1-joe@pf.is.s.u-tokyo.ac.jp Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 4e6b45d commit 6330002

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/dsa/bcm_sf2.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,10 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
638638
of_remove_property(child, prop);
639639

640640
phydev = of_phy_find_device(child);
641-
if (phydev)
641+
if (phydev) {
642642
phy_device_remove(phydev);
643+
phy_device_free(phydev);
644+
}
643645
}
644646

645647
err = mdiobus_register(priv->slave_mii_bus);

0 commit comments

Comments
 (0)