From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 11 Jan 2006 21:42:20 +0000 (+0100)
Subject: [PATCH] x86_64: Remove unprotected iret
X-Git-Tag: v2.6.16-rc1~381
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=505cc4e1d6885acaee008950ac9c6e838f2209f8;p=linux-2.6

[PATCH] x86_64: Remove unprotected iret

Make sure no iret can fault without attached recovery code.
Cannot happen in the normal case, but might be useful
with kernel debuggers

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 9ff42041bb..bd21ebafaf 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -754,7 +754,7 @@ error_exit:
 	jnz  retint_careful
 	swapgs 
 	RESTORE_ARGS 0,8,0						
-	iretq
+	jmp iret_label
 	CFI_ENDPROC
 
 error_kernelspace: