diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:41 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:41 -0400 |
| commit | 658fdbef66e5e9be79b457edc2cbbb3add840aa9 (patch) | |
| tree | 931fa9bac154671ab96762fee73b3641b1191bb8 /arch/x86_64/kernel/entry.S | |
| parent | adf1423698f00d00b267f7dca8231340ce7d65ef (diff) | |
[PATCH] Don't leak NT bit into next task
SYSENTER can cause a NT to be set which might cause crashes on the IRET
in the next task.
Following similar i386 patch from Linus.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/entry.S')
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 4cbc65290ae7..2802524104f3 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
| @@ -155,6 +155,10 @@ | |||
| 155 | /* rdi: prev */ | 155 | /* rdi: prev */ |
| 156 | ENTRY(ret_from_fork) | 156 | ENTRY(ret_from_fork) |
| 157 | CFI_DEFAULT_STACK | 157 | CFI_DEFAULT_STACK |
| 158 | push kernel_eflags(%rip) | ||
| 159 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 160 | popf # reset kernel eflags | ||
| 161 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 158 | call schedule_tail | 162 | call schedule_tail |
| 159 | GET_THREAD_INFO(%rcx) | 163 | GET_THREAD_INFO(%rcx) |
| 160 | testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),threadinfo_flags(%rcx) | 164 | testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),threadinfo_flags(%rcx) |