From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752793AbdBFX4Z (ORCPT ); Mon, 6 Feb 2017 18:56:25 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34024 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbdBFX4W (ORCPT ); Mon, 6 Feb 2017 18:56:22 -0500 From: Florian Fainelli To: netdev@vger.kernel.org Cc: zefir.kurtisi@neratec.com, Florian Fainelli , Sebastian Hesselbarth , Wingman Kwok , Murali Karicheri , Andrew Lunn , Vivien Didelot , "David S. Miller" , Philippe Reynes , Sergei Shtylyov , Jisheng Zhang , Jarod Wilson , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 4/4] net: dsa: Do not clobber PHY link outside of state machine Date: Mon, 6 Feb 2017 15:55:23 -0800 Message-Id: <20170206235523.23216-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170206235523.23216-1-f.fainelli@gmail.com> References: <20170206235523.23216-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Florian Fainelli --- 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