LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] x86_64: make traps on 'iret' be debuggable in user space
@ 2008-02-05  7:51 Roland McGrath
  2008-02-05  8:01 ` Ingo Molnar
  0 siblings, 1 reply; 9+ messages in thread
From: Roland McGrath @ 2008-02-05  7:51 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner; +Cc: linux-kernel


This makes the x86-64 behavior for 32-bit processes that set
bogus %cs/%ss values (the only ones that can fault in iret)
match what the native i386 behavior has been since:

	commit a879cbbb34cbecfa9707fbb6e5a00c503ac1ecb9
	Author: Linus Torvalds <torvalds@ppc970.osdl.org>
	Date:   Fri Apr 29 09:38:44 2005 -0700

	    x86: make traps on 'iret' be debuggable in user space

Signed-off-by: Roland McGrath <roland@redhat.com>
---
 arch/x86/kernel/entry_64.S |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 07d4aba..62744b1 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -592,13 +592,26 @@ ENTRY(native_iret)
 	.quad native_iret, bad_iret
 	.previous
 	.section .fixup,"ax"
-	/* force a signal here? this matches i386 behaviour */
-	/* running with kernel gs */
 bad_iret:
-	movq $11,%rdi	/* SIGSEGV */
-	TRACE_IRQS_ON
-	ENABLE_INTERRUPTS(CLBR_ANY | ~(CLBR_RDI))
-	jmp do_exit
+	/*
+	 * The iret traps when the %cs or %ss being restored is bogus.
+	 * (This can only happen in a 32-bit process, and only by invalid
+	 * selectors being set via ptrace.  Changing the value enforces
+	 * that the USER_RPL bits are set, but not that the index is valid.)
+	 * We've lost the original trap vector and error code.
+	 * #GPF is the most likely one to get for an invalid selector.
+	 * So pretend we completed the iret and took the #GPF in user mode.
+	 *
+	 * We are now running with the kernel GS after exception recovery.
+	 * But error_entry expects us to have user GS to match the user %cs,
+	 * so swap back.
+	 */
+	INTR_FRAME
+	pushq $0
+	CFI_ADJUST_CFA_OFFSET 8
+	SWAPGS
+	jmp general_protection
+	CFI_ENDPROC
 	.previous
 
 	/* edi: workmask, edx: work */

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2008-02-08  0:06 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-05  7:51 [PATCH] x86_64: make traps on 'iret' be debuggable in user space Roland McGrath
2008-02-05  8:01 ` Ingo Molnar
2008-02-05  8:15   ` Roland McGrath
2008-02-05  8:16     ` Roland McGrath
2008-02-07 20:13     ` Chuck Ebbert
2008-02-07 20:30       ` Roland McGrath
2008-02-07 23:28         ` Chuck Ebbert
2008-02-08  0:00           ` Roland McGrath
2008-02-08  0:06             ` Chuck Ebbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).