]> www.infradead.org Git - users/willy/xarray.git/commitdiff
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
authorJoe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Tue, 6 Aug 2024 01:13:27 +0000 (10:13 +0900)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Aug 2024 03:13:13 +0000 (20:13 -0700)
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: 771089c2a485 ("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>
drivers/net/dsa/bcm_sf2.c

index ed1e6560df25ec270d1716672f42f6861e06c443..0e663ec0c12a3bcbd865f29b13596dae3b6a6a30 100644 (file)
@@ -675,8 +675,10 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
                        of_remove_property(child, prop);
 
                phydev = of_phy_find_device(child);
-               if (phydev)
+               if (phydev) {
                        phy_device_remove(phydev);
+                       phy_device_free(phydev);
+               }
        }
 
        err = mdiobus_register(priv->user_mii_bus);