From: Greg Kroah-Hartman Date: Mon, 27 Feb 2012 23:04:08 +0000 (-0800) Subject: remove queue-3.2/x86-nmi-test-saved-cs-in-nmi-to-determine-nested-nmi-case.patch X-Git-Tag: v3.2.9~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a0928a92759580e0f19cc59e0eda5418d32a0da;p=thirdparty%2Fkernel%2Fstable-queue.git remove queue-3.2/x86-nmi-test-saved-cs-in-nmi-to-determine-nested-nmi-case.patch --- diff --git a/queue-3.2/series b/queue-3.2/series index 50d484a0833..98477738193 100644 --- a/queue-3.2/series +++ b/queue-3.2/series @@ -54,4 +54,3 @@ arm-omap-fix-oops-in-drivers-video-omap2-dss-dpi.c.patch arm-omap-fix-oops-in-arch-arm-mach-omap2-vp.c-when-pmic-is-not-found.patch x86-amd-fix-l1i-and-l2-cache-sharing-information-for-amd-family-15h-processors.patch ath9k-stop-on-rates-with-idx-1-in-ath9k-rate-control-s-.tx_status.patch -x86-nmi-test-saved-cs-in-nmi-to-determine-nested-nmi-case.patch diff --git a/queue-3.2/x86-nmi-test-saved-cs-in-nmi-to-determine-nested-nmi-case.patch b/queue-3.2/x86-nmi-test-saved-cs-in-nmi-to-determine-nested-nmi-case.patch deleted file mode 100644 index bf3cce68c04..00000000000 --- a/queue-3.2/x86-nmi-test-saved-cs-in-nmi-to-determine-nested-nmi-case.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 45d5a1683c04be28abdf5c04c27b1417e0374486 Mon Sep 17 00:00:00 2001 -From: Steven Rostedt -Date: Sun, 19 Feb 2012 16:43:37 -0500 -Subject: x86/nmi: Test saved %cs in NMI to determine nested NMI case - -From: Steven Rostedt - -commit 45d5a1683c04be28abdf5c04c27b1417e0374486 upstream. - -Currently, the NMI handler tests if it is nested by checking the -special variable saved on the stack (set during NMI handling) -and whether the saved stack is the NMI stack as well (to prevent -the race when the variable is set to zero). - -But userspace may set their %rsp to any value as long as they do -not derefence it, and it may make it point to the NMI stack, -which will prevent NMIs from triggering while the userspace app -is running. (I tested this, and it is indeed the case) - -Add another check to determine nested NMIs by looking at the -saved %cs (code segment register) and making sure that it is the -kernel code segment. - -Signed-off-by: Steven Rostedt -Cc: H. Peter Anvin -Cc: Peter Zijlstra -Cc: Linus Torvalds -Link: http://lkml.kernel.org/r/1329687817.1561.27.camel@acer.local.home -Signed-off-by: Ingo Molnar -Signed-off-by: Greg Kroah-Hartman - -diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S -index 3fe8239..debd851 100644 ---- a/arch/x86/kernel/entry_64.S -+++ b/arch/x86/kernel/entry_64.S -@@ -1532,6 +1532,13 @@ ENTRY(nmi) - pushq_cfi %rdx - - /* -+ * If %cs was not the kernel segment, then the NMI triggered in user -+ * space, which means it is definitely not nested. -+ */ -+ cmp $__KERNEL_CS, 16(%rsp) -+ jne first_nmi -+ -+ /* - * Check the special variable on the stack to see if NMIs are - * executing. - */