xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: phy_ethtool_ksettings_set: Lock the PHY while changing settings

Browse Source 
commit af1a02aa23c37045e6adfcf074cf7dbac167a403 upstream.

There is a race condition where the PHY state machine can change
members of the phydev structure at the same time userspace requests a
change via ethtool. To prevent this, have phy_ethtool_ksettings_set
take the PHY lock.

Fixes: 2d55173e71 ("phy: add generic function to support ksetting support")
Reported-by: Walter Stoll <Walter.Stoll@duagon.com>
Suggested-by: Walter Stoll <Walter.Stoll@duagon.com>
Tested-by: Walter Stoll <Walter.Stoll@duagon.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrew Lunn
2021-10-24 21:48:05 +02:00
committed by Greg Kroah-Hartman
parent 5b88bb9377
commit 4509000a25
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/phy.c
View File

@@ -814,6 +814,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
duplex != DUPLEX_FULL))) duplex != DUPLEX_FULL)))
return -EINVAL; return -EINVAL;
mutex_lock(&phydev->lock);
phydev->autoneg = autoneg; phydev->autoneg = autoneg;
if (autoneg == AUTONEG_DISABLE) { if (autoneg == AUTONEG_DISABLE) {
@@ -830,8 +831,9 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
phydev->mdix_ctrl = cmd->base.eth_tp_mdix_ctrl; phydev->mdix_ctrl = cmd->base.eth_tp_mdix_ctrl;
/* Restart the PHY */ /* Restart the PHY */
phy_start_aneg(phydev); _phy_start_aneg(phydev);
mutex_unlock(&phydev->lock);
return 0; return 0;
} }
EXPORT_SYMBOL(phy_ethtool_ksettings_set); EXPORT_SYMBOL(phy_ethtool_ksettings_set);