Commit 6a52e733 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski

net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup

DSA supports connecting to a phy-handle, and has a fallback to a non-OF
based method of connecting to an internal PHY on the switch's own MDIO
bus, if no phy-handle and no fixed-link nodes were present.

The -ENODEV error code from the first attempt (phylink_of_phy_connect)
is what triggers the second attempt (phylink_connect_phy).

However, when the first attempt returns a different error code than
-ENODEV, this results in an unbalance of calls to phylink_create and
phylink_destroy by the time we exit the function. The phylink instance
has leaked.

There are many other error codes that can be returned by
phylink_of_phy_connect. For example, phylink_validate returns -EINVAL.
So this is a practical issue too.

Fixes: aab9c406 ("net: dsa: Plug in PHYLINK support")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20210914134331.2303380-1-vladimir.oltean@nxp.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7366c23f
...@@ -1854,13 +1854,11 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) ...@@ -1854,13 +1854,11 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev)
* use the switch internal MDIO bus instead * use the switch internal MDIO bus instead
*/ */
ret = dsa_slave_phy_connect(slave_dev, dp->index, phy_flags); ret = dsa_slave_phy_connect(slave_dev, dp->index, phy_flags);
}
if (ret) { if (ret) {
netdev_err(slave_dev, netdev_err(slave_dev, "failed to connect to PHY: %pe\n",
"failed to connect to port %d: %d\n", ERR_PTR(ret));
dp->index, ret);
phylink_destroy(dp->pl); phylink_destroy(dp->pl);
return ret;
}
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment