Commit b9510221 authored by Kory Maincent's avatar Kory Maincent Committed by Paolo Abeni
Browse files

net: sh_eth: Fix missing rtnl lock in suspend/resume path 



Fix the suspend/resume path by ensuring the rtnl lock is held where
required. Calls to sh_eth_close, sh_eth_open and wol operations must be
performed under the rtnl lock to prevent conflicts with ongoing ndo
operations.

Fixes: b71af046 ("sh_eth: add more PM methods")
Tested-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 2c2ebb2b

drivers/net/ethernet/renesas/sh_eth.c

+4 −0
Original line number Diff line number Diff line
@@ -3494,10 +3494,12 @@ static int sh_eth_suspend(struct device *dev) 


	netif_device_detach(ndev);



	rtnl_lock();

	if (mdp->wol_enabled)

		ret = sh_eth_wol_setup(ndev);

	else

		ret = sh_eth_close(ndev);

	rtnl_unlock();



	return ret;

}
@@ -3511,10 +3513,12 @@ static int sh_eth_resume(struct device *dev) 
	if (!netif_running(ndev))

		return 0;



	rtnl_lock();

	if (mdp->wol_enabled)

		ret = sh_eth_wol_restore(ndev);

	else

		ret = sh_eth_open(ndev);

	rtnl_unlock();



	if (ret < 0)

		return ret;