mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
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: 0e27921816
("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>
This commit is contained in:
parent
f650bcd4ef
commit
8640f8dc6d
3 changed files with 30 additions and 12 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue