Commit 3af409ca authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: enetc: fix destroyed phylink dereference during unbind 



The following call path suggests that calling unregister_netdev on an
interface that is up will first bring it down.

enetc_pf_remove
-> unregister_netdev
   -> unregister_netdevice_queue
      -> unregister_netdevice_many
         -> dev_close_many
            -> __dev_close_many
               -> enetc_close
                  -> enetc_stop
                     -> phylink_stop

However, enetc first destroys the phylink instance, then calls
unregister_netdev. This is already dissimilar to the setup (and error
path teardown path) from enetc_pf_probe, but more than that, it is buggy
because it is invalid to call phylink_stop after phylink_destroy.

So let's first unregister the netdev (and let the .ndo_stop events
consume themselves), then destroy the phylink instance, then free the
netdev.

Fixes: 71b77a7a ("enetc: Migrate to PHYLINK and PCS_LYNX")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 396d7f23

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+3 −2
Original line number Diff line number Diff line
@@ -1157,14 +1157,15 @@ static void enetc_pf_remove(struct pci_dev *pdev) 
	struct enetc_ndev_priv *priv;



	priv = netdev_priv(si->ndev);

	enetc_phylink_destroy(priv);

	enetc_mdiobus_destroy(pf);



	if (pf->num_vfs)

		enetc_sriov_configure(pdev, 0);



	unregister_netdev(si->ndev);



	enetc_phylink_destroy(priv);

	enetc_mdiobus_destroy(pf);



	enetc_free_msix(priv);



	enetc_free_si_resources(priv);