tree 1782971ae77b3d902fdf56e77e9649b3b6c48ca4
parent e493073d8d053429fbb42331b57a95dd0d61cadb
author Stas Sergeev <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:01 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:01 -0700
[PATCH] fix crash in entry.S restore_all
Fix the access-above-bottom-of-stack crash.
1. Allows to preserve the valueable optimization
2. Works for NMIs
3. Doesn't care whether or not there are more of the like instances
where the stack is left empty.
4. Seems to work for me without the crashes:)
(akpm: this is still under discussion, although I _think_ it's OK. You might
want to hold off)
Signed-off-by: Stas Sergeev <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
i386/kernel/entry.S | 3 +++
i386/kernel/process.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
Index: arch/i386/kernel/entry.S
===================================================================
--- c4d697372f6c2f2e2f2548f75c1dbb5b821ab805/arch/i386/kernel/entry.S
(mode:100644 sha1:1e45ff292bc99df5630b375f5518b86bbfbc3319)
+++ 1782971ae77b3d902fdf56e77e9649b3b6c48ca4/arch/i386/kernel/entry.S
(mode:100644 sha1:3c73dc865ead3ad2323098a3b78b0fc8042e7489)
@@ -245,6 +245,9 @@
restore_all:
movl EFLAGS(%esp), %eax # mix EFLAGS, SS and CS
+ # Warning: OLDSS(%esp) contains the wrong/random values if we
+ # are returning to the kernel.
+ # See comments in process.c:copy_thread() for details.
movb OLDSS(%esp), %ah
movb CS(%esp), %al
andl $(VM_MASK | (4 << 8) | 3), %eax
Index: arch/i386/kernel/process.c
===================================================================
--- c4d697372f6c2f2e2f2548f75c1dbb5b821ab805/arch/i386/kernel/process.c
(mode:100644 sha1:c36fedf40e958093edcbe2f8fe82b64fe3ad0aeb)
+++ 1782971ae77b3d902fdf56e77e9649b3b6c48ca4/arch/i386/kernel/process.c
(mode:100644 sha1:36145efc61b5e7aeb6da9360942152b08f449c0d)
@@ -405,7 +405,17 @@
childregs->esp = esp;
p->thread.esp = (unsigned long) childregs;
- p->thread.esp0 = (unsigned long) (childregs+1);
+ /*
+ * The below -8 is to reserve 8 bytes on top of the ring0 stack.
+ * This is necessary to guarantee that the entire "struct pt_regs"
+ * is accessable even if the CPU haven't stored the SS/ESP registers
+ * on the stack (interrupt gate does not save these registers
+ * when switching to the same priv ring).
+ * Therefore beware: accessing the xss/esp fields of the
+ * "struct pt_regs" is possible, but they may contain the
+ * completely wrong values.
+ */
+ p->thread.esp0 = (unsigned long) (childregs+1) - 8;
p->thread.eip = (unsigned long) ret_from_fork;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
