diff options
author | Andi Kleen <ak@suse.de> | 2007-06-22 20:29:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-22 21:41:19 -0400 |
commit | 75154f402ef18e459ff97ddece25656b6c2b329c (patch) | |
tree | 6757b77ee2c712c4b64f334ff8c5b1a41a64083b /arch/x86_64/kernel/entry.S | |
parent | e2f1f19272f8de0374ad297b9806f8b6509e0013 (diff) |
x86_64: Ignore compat mode SYSCALL when IA32_EMULATION is not defined
Previously a program could switch to a compat mode segment and then
execute SYSCALL and it would jump to an uninitialized MSR and crash
the kernel.
Instead supply a dummy target for this case.
Pointed out by Jan Beulich
Cc: jbeulich@novell.com
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/entry.S')
-rw-r--r-- | arch/x86_64/kernel/entry.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index fa984b53e7e6..a67f87bf4015 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
@@ -1163,3 +1163,10 @@ ENTRY(call_softirq) | |||
1163 | ret | 1163 | ret |
1164 | CFI_ENDPROC | 1164 | CFI_ENDPROC |
1165 | ENDPROC(call_softirq) | 1165 | ENDPROC(call_softirq) |
1166 | |||
1167 | KPROBE_ENTRY(ignore_sysret) | ||
1168 | CFI_STARTPROC | ||
1169 | mov $-ENOSYS,%eax | ||
1170 | sysret | ||
1171 | CFI_ENDPROC | ||
1172 | ENDPROC(ignore_sysret) | ||