Commit 510b18cf authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Paolo Abeni
Browse files

rswitch: Fix renesas_eth_sw_remove() implementation 



Fix functions calling order and a condition in renesas_eth_sw_remove().
Otherwise, kernel NULL pointer dereference happens from phy_stop() if
a net device opens.

Fixes: 3590918b ("net: ethernet: renesas: Add support for "Ethernet Switch"")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 50e49214

drivers/net/ethernet/renesas/rswitch.c

+6 −4
Original line number Diff line number Diff line
@@ -1964,15 +1964,17 @@ static void rswitch_deinit(struct rswitch_private *priv) 
	rswitch_gwca_hw_deinit(priv);

	rcar_gen4_ptp_unregister(priv->ptp_priv);



	for (i = 0; i < RSWITCH_NUM_PORTS; i++) {

	rswitch_for_each_enabled_port(priv, i) {

		struct rswitch_device *rdev = priv->rdev[i];



		phy_exit(priv->rdev[i]->serdes);

		rswitch_ether_port_deinit_one(rdev);

		unregister_netdev(rdev->ndev);

		rswitch_device_free(priv, i);

		rswitch_ether_port_deinit_one(rdev);

		phy_exit(priv->rdev[i]->serdes);

	}



	for (i = 0; i < RSWITCH_NUM_PORTS; i++)

		rswitch_device_free(priv, i);



	rswitch_gwca_ts_queue_free(priv);

	rswitch_gwca_linkfix_free(priv);