| 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: Mon, 6 May 2013 22:52:47 -0700 From: Jeff Kirsher <jeffrey.t.kirsher@...el.com> To: davem@...emloft.net, torvalds@...ux-foundation.org Cc: Bruce Allan <bruce.w.allan@...el.com>, netdev@...r.kernel.org, gospo@...hat.com, sassmann@...hat.com, linux-kernel@...r.kernel.org, Jeff Kirsher <jeffrey.t.kirsher@...el.com> Subject: [net] e1000e: fix scheduling while atomic bug From: Bruce Allan <bruce.w.allan@...el.com> A scheduling while atomic bug was introduced recently (by commit ce43a216 e1000e: cleanup USLEEP_RANGE checkpatch checks). Revert the particular instance of usleep_range() which causes the bug. Reported-by: Maarten Lankhorst <m.b.lankhorst@...il.com> Signed-off-by: Bruce Allan <bruce.w.allan@...el.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com> --- drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h index 82f1c84..ffbc08f 100644 --- a/drivers/net/ethernet/intel/e1000e/e1000.h +++ b/drivers/net/ethernet/intel/e1000e/e1000.h @@ -600,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw) s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT; while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i) - usleep_range(50, 100); + udelay(50); return i; } -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists