diff options
| author | Jan Beulich <jbeulich@novell.com> | 2006-01-11 16:42:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:01:10 -0500 |
| commit | 505cc4e1d6885acaee008950ac9c6e838f2209f8 (patch) | |
| tree | 068e4d458f02003853d7d9a1a8a6b72338222f94 | |
| parent | eca37c18beb306dd9dea4579d7214e1b4414b3fb (diff) | |
[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>
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 9ff42041bb6b..bd21ebafaf66 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
| @@ -754,7 +754,7 @@ error_exit: | |||
| 754 | jnz retint_careful | 754 | jnz retint_careful |
| 755 | swapgs | 755 | swapgs |
| 756 | RESTORE_ARGS 0,8,0 | 756 | RESTORE_ARGS 0,8,0 |
| 757 | iretq | 757 | jmp iret_label |
| 758 | CFI_ENDPROC | 758 | CFI_ENDPROC |
| 759 | 759 | ||
| 760 | error_kernelspace: | 760 | error_kernelspace: |