OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eca37c1
)
[PATCH] x86_64: Remove unprotected iret
author
Jan Beulich
<jbeulich@novell.com>
Wed, 11 Jan 2006 21:42:20 +0000
(22:42 +0100)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 12 Jan 2006 03:01:10 +0000
(19:01 -0800)
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>
arch/x86_64/kernel/entry.S
patch
|
blob
|
history
diff --git
a/arch/x86_64/kernel/entry.S
b/arch/x86_64/kernel/entry.S
index
9ff4204
..
bd21eba
100644
(file)
--- 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: