lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 12 Jan 2021 07:55:00 -0500 From: Sasha Levin <sashal@...nel.org> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org Cc: Mario Limonciello <mario.limonciello@...l.com>, Alexander Duyck <alexander.duyck@...il.com>, Yijun Shen <Yijun.shen@...l.com>, Tony Nguyen <anthony.l.nguyen@...el.com>, Sasha Levin <sashal@...nel.org>, intel-wired-lan@...ts.osuosl.org, netdev@...r.kernel.org Subject: [PATCH AUTOSEL 5.10 18/51] e1000e: Only run S0ix flows if shutdown succeeded From: Mario Limonciello <mario.limonciello@...l.com> [ Upstream commit 808e0d8832cc81738f3e8df12dff0688352baf50 ] If the shutdown failed, the part will be thawed and running S0ix flows will put it into an undefined state. Reported-by: Alexander Duyck <alexander.duyck@...il.com> Reviewed-by: Alexander Duyck <alexander.duyck@...il.com> Signed-off-by: Mario Limonciello <mario.limonciello@...l.com> Tested-by: Yijun Shen <Yijun.shen@...l.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@...el.com> Signed-off-by: Sasha Levin <sashal@...nel.org> --- drivers/net/ethernet/intel/e1000e/netdev.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 128ab6898070e..6588f5d4a2be8 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6970,13 +6970,14 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev) e1000e_pm_freeze(dev); rc = __e1000_shutdown(pdev, false); - if (rc) + if (rc) { e1000e_pm_thaw(dev); - - /* Introduce S0ix implementation */ - if (hw->mac.type >= e1000_pch_cnp && - !e1000e_check_me(hw->adapter->pdev->device)) - e1000e_s0ix_entry_flow(adapter); + } else { + /* Introduce S0ix implementation */ + if (hw->mac.type >= e1000_pch_cnp && + !e1000e_check_me(hw->adapter->pdev->device)) + e1000e_s0ix_entry_flow(adapter); + } return rc; } -- 2.27.0
Powered by blists - more mailing lists