diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2020-03-03 15:01:46 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-03 15:45:49 -0800 |
| commit | 8640f8dc6d657ebfb4e67c202ad32c5457858a13 (patch) | |
| tree | 6f99a9e8436b274adc01c4cf79c6476b60af6c2f /net/dsa/slave.c | |
| parent | Merge branch 'Fix-IPv6-peer-route-update' (diff) | |
| download | linux-dev-8640f8dc6d657ebfb4e67c202ad32c5457858a13.tar.xz linux-dev-8640f8dc6d657ebfb4e67c202ad32c5457858a13.zip | |
net: dsa: fix phylink_start()/phylink_stop() calls
Place phylink_start()/phylink_stop() inside dsa_port_enable() and
dsa_port_disable(), which ensures that we call phylink_stop() before
tearing down phylink - which is a documented requirement. Failure
to do so can cause use-after-free bugs.
Fixes: 0e27921816ad ("net: dsa: Use PHYLINK for the CPU/DSA ports")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 088c886e609e..ddc0f9236928 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -88,12 +88,10 @@ static int dsa_slave_open(struct net_device *dev) goto clear_allmulti; } - err = dsa_port_enable(dp, dev->phydev); + err = dsa_port_enable_rt(dp, dev->phydev); if (err) goto clear_promisc; - phylink_start(dp->pl); - return 0; clear_promisc: @@ -114,9 +112,7 @@ static int dsa_slave_close(struct net_device *dev) struct net_device *master = dsa_slave_to_master(dev); struct dsa_port *dp = dsa_slave_to_port(dev); - phylink_stop(dp->pl); - - dsa_port_disable(dp); + dsa_port_disable_rt(dp); dev_mc_unsync(master, dev); dev_uc_unsync(master, dev); |