Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1575261

[PATCH net-next 4/4] net: dsa: Do not clobber PHY link outside of state machine

Show all headers | View raw

Calling phy_read_status() means that we may call into
genphy_read_status() which in turn will use genphy_update_link() which
can make changes to phydev->link outside of the state machine's state
transitions. This is an invalid behavior that is now caught as of
811a919135b9 ("phy state machine: failsafe leave invalid RUNNING state")

Reported-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/dsa/slave.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 09fc3e9462c1..4b6fb6b14de4 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -651,14 +651,10 @@ dsa_slave_get_link_ksettings(struct net_device *dev,
 			     struct ethtool_link_ksettings *cmd)
 {
 	struct dsa_slave_priv *p = netdev_priv(dev);
-	int err;
+	int err = -EOPNOTSUPP;
 
-	err = -EOPNOTSUPP;
-	if (p->phy != NULL) {
-		err = phy_read_status(p->phy);
-		if (err == 0)
-			err = phy_ethtool_ksettings_get(p->phy, cmd);
-	}
+	if (p->phy != NULL)
+		err = phy_ethtool_ksettings_get(p->phy, cmd);
 
 	return err;
 }
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 0/4] net: Incorrect use of phy_read_status() Florian Fainelli <f.fainelli@gmail.com> - 2017-02-07 01:00 +0100
  [PATCH net-next 4/4] net: dsa: Do not clobber PHY link outside of state machine Florian Fainelli <f.fainelli@gmail.com> - 2017-02-07 01:00 +0100
    Re: [PATCH net-next 4/4] net: dsa: Do not clobber PHY link outside  of state machine Andrew Lunn <andrew@lunn.ch> - 2017-02-07 01:20 +0100
      RE: [PATCH net-next 4/4] net: dsa: Do not clobber PHY link outside  of state machine David Laight <David.Laight@ACULAB.COM> - 2017-02-07 12:50 +0100
        Re: [PATCH net-next 4/4] net: dsa: Do not clobber PHY link outside  of state machine Andrew Lunn <andrew@lunn.ch> - 2017-02-07 14:20 +0100
  [PATCH net-next 3/4] net: netcp: Do not clobber PHY link outside of state machine Florian Fainelli <f.fainelli@gmail.com> - 2017-02-07 01:00 +0100
  [PATCH net-next 2/4] net: pxa168_eth: Do not clobber PHY link outside of state machine Florian Fainelli <f.fainelli@gmail.com> - 2017-02-07 01:00 +0100
  [PATCH net-next 1/4] net: mv643xx_eth: Do not clobber PHY link outside of state machine Florian Fainelli <f.fainelli@gmail.com> - 2017-02-07 01:00 +0100
    Re: [PATCH net-next 1/4] net: mv643xx_eth: Do not clobber PHY link  outside of state machine Andrew Lunn <andrew@lunn.ch> - 2017-02-07 01:20 +0100
  Re: [PATCH net-next 0/4] net: Incorrect use of phy_read_status() David Miller <davem@davemloft.net> - 2017-02-07 20:00 +0100

csiph-web