diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 10:52:41 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:41 +0200 |
| commit | 658fdbef66e5e9be79b457edc2cbbb3add840aa9 (patch) | |
| tree | 931fa9bac154671ab96762fee73b3641b1191bb8 /include | |
| parent | adf1423698f00d00b267f7dca8231340ce7d65ef (diff) | |
| download | op-kernel-dev-658fdbef66e5e9be79b457edc2cbbb3add840aa9.zip op-kernel-dev-658fdbef66e5e9be79b457edc2cbbb3add840aa9.tar.gz | |
[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 'include')
| -rw-r--r-- | include/asm-x86_64/system.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h index 6bf170b..bd376bc 100644 --- a/include/asm-x86_64/system.h +++ b/include/asm-x86_64/system.h @@ -14,12 +14,13 @@ #define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t" /* frame pointer must be last for get_wchan */ -#define SAVE_CONTEXT "pushq %%rbp ; movq %%rsi,%%rbp\n\t" -#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp\n\t" +#define SAVE_CONTEXT "pushf ; pushq %%rbp ; movq %%rsi,%%rbp\n\t" +#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp ; popf\t" #define __EXTRA_CLOBBER \ ,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15" +/* Save restore flags to clear handle leaking NT */ #define switch_to(prev,next,last) \ asm volatile(SAVE_CONTEXT \ "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */ \ |
