ff4b346ede
disk fails with UnboundLocalError: local variable 'dev_type' referenced before assignment 21678-xend-mac-fix.patch - bnc#586221 - cannot add DomU with USB host controller defined domu-usb-controller.patch (Chun Yan Liu) - Upstream patches from Jan 21151-trace-bounds-check.patch 21627-cpuidle-wrap.patch 21643-vmx-vpmu-pmc-offset.patch 21682-trace-buffer-range.patch 21683-vtd-kill-timer-conditional.patch 21693-memevent-64bit-only.patch 21695-trace-t_info-readonly.patch 21698-x86-pirq-range-check.patch 21699-p2m-query-for-type-change.patch 21700-32on64-vm86-gpf.patch 21705-trace-printk.patch 21706-trace-security.patch 21712-amd-osvw.patch 21744-x86-cpufreq-range-check.patch - bnc #599550 - Xen cannot distinguish the status of 'pause' addcommand_domstate.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=63
26 lines
988 B
Diff
26 lines
988 B
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# Date 1277917963 -3600
|
|
# Node ID fae04060a4f4e364c5012692b97ae1eeec3a326e
|
|
# Parent 7cda3ad44c6d4e799e65b2ffe21e609f50cdb94b
|
|
Fix #GPF injection into compat guests in vm86 code
|
|
|
|
not to let the guest disable interrupts in the real EFLAGS.
|
|
|
|
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
|
|
|
|
--- a/xen/arch/x86/x86_64/compat/traps.c
|
|
+++ b/xen/arch/x86/x86_64/compat/traps.c
|
|
@@ -127,9 +127,8 @@ unsigned int compat_iret(void)
|
|
ti = &v->arch.guest_context.trap_ctxt[13];
|
|
if ( TI_GET_IF(ti) )
|
|
eflags &= ~X86_EFLAGS_IF;
|
|
- regs->_eflags = eflags & ~(X86_EFLAGS_VM|X86_EFLAGS_RF|
|
|
- X86_EFLAGS_NT|X86_EFLAGS_TF);
|
|
-
|
|
+ regs->_eflags &= ~(X86_EFLAGS_VM|X86_EFLAGS_RF|
|
|
+ X86_EFLAGS_NT|X86_EFLAGS_TF);
|
|
if ( unlikely(__put_user(0, (u32 *)regs->rsp)) )
|
|
goto exit_and_crash;
|
|
regs->_eip = ti->address;
|