diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2019-11-02 20:17:39 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-05 17:54:59 -0800 |
| commit | e684000b8a2b1e14b9f8ebd72dfd998d44a864ca (patch) | |
| tree | 43d0f844fb34ceefa1edfe375d91e6dc07d79ebb /drivers/net/dsa/bcm_sf2.c | |
| parent | net: sched: prevent duplicate flower rules from tcf_proto destroy race (diff) | |
| download | linux-dev-e684000b8a2b1e14b9f8ebd72dfd998d44a864ca.tar.xz linux-dev-e684000b8a2b1e14b9f8ebd72dfd998d44a864ca.zip | |
net: dsa: bcm_sf2: Fix driver removal
With the DSA core doing the call to dsa_port_disable() we do not need to
do that within the driver itself. This could cause an use after free
since past dsa_unregister_switch() we should not be accessing any
dsa_switch internal structures.
Fixes: 0394a63acfe2 ("net: dsa: enable and disable all ports")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/bcm_sf2.c')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index d44651ad520c..69fc13046ac7 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -1215,10 +1215,10 @@ static int bcm_sf2_sw_remove(struct platform_device *pdev) struct bcm_sf2_priv *priv = platform_get_drvdata(pdev); priv->wol_ports_mask = 0; + /* Disable interrupts */ + bcm_sf2_intr_disable(priv); dsa_unregister_switch(priv->dev->ds); bcm_sf2_cfp_exit(priv->dev->ds); - /* Disable all ports and interrupts */ - bcm_sf2_sw_suspend(priv->dev->ds); bcm_sf2_mdio_unregister(priv); return 0; |