diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-07-27 10:00:12 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-07-27 10:00:12 +0200 |
| commit | 8b0ea8ec8c8d6f5a55939707625c0231a29110bf (patch) | |
| tree | 1902c409e9a82dab90fa5fe6ff1caebb1f7658ef | |
| parent | 2621048598e9c71a44811add31d8d7530d1ed056 (diff) | |
| download | xen-8b0ea8ec8c8d6f5a55939707625c0231a29110bf.tar.gz xen-8b0ea8ec8c8d6f5a55939707625c0231a29110bf.tar.bz2 xen-8b0ea8ec8c8d6f5a55939707625c0231a29110bf.zip | |
x86-64: drop updating of UREGS_rip when converting sysenter to #GP
This was set to zero immediately before the #GP injection code, since
SYSENTER doesn't really have a return address.
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Furthermore, UREGS_cs and UREGS_rip don't need to be written a second
time, as the PUSHes above already can/do take care of putting in place
the intended values.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/arch/x86/x86_64/entry.S | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 3204479503..997bc94c4e 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -275,15 +275,13 @@ ENTRY(sysenter_entry) pushfq .globl sysenter_eflags_saved sysenter_eflags_saved: - pushq $0 - pushq $0 + pushq $3 /* ring 3 null cs */ + pushq $0 /* null rip */ pushq $0 movl $TRAP_syscall,4(%rsp) SAVE_ALL GET_CURRENT(%rbx) cmpb $0,VCPU_sysenter_disables_events(%rbx) - movq $0,UREGS_rip(%rsp) /* null rip */ - movl $3,UREGS_cs(%rsp) /* ring 3 null cs */ movq VCPU_sysenter_addr(%rbx),%rax setne %cl leaq VCPU_trap_bounce(%rbx),%rdx @@ -292,7 +290,6 @@ sysenter_eflags_saved: UNLIKELY_START(z, sysenter_gpf) movq VCPU_trap_ctxt(%rbx),%rsi movl $TRAP_gp_fault,UREGS_entry_vector(%rsp) - subq $2,UREGS_rip(%rsp) movl %eax,TRAPBOUNCE_error_code(%rdx) movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi) |