xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] Fix #GPF injection into compat guests in

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] Fix #GPF injection into compat guests in vm86 code
From:	Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Wed, 30 Jun 2010 14:20:18 -0700
Delivery-date:	Wed, 30 Jun 2010 14:30:42 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# 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@xxxxxxxxxx>
---
 xen/arch/x86/x86_64/compat/traps.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff -r 7cda3ad44c6d -r fae04060a4f4 xen/arch/x86/x86_64/compat/traps.c
--- a/xen/arch/x86/x86_64/compat/traps.c        Wed Jun 30 18:11:42 2010 +0100
+++ b/xen/arch/x86/x86_64/compat/traps.c        Wed Jun 30 18:12:43 2010 +0100
@@ -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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] Fix #GPF injection into compat guests in vm86 code, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] xenpaging: Fix 32-bit build after fixed-width type changes., Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-4.0-testing] tmem: skip special case in alloc_heap_pages() if tmem holds no pages, Xen patchbot-4.0-testing
Previous by Thread:	[Xen-changelog] [xen-unstable] xenpaging: Fix 32-bit build after fixed-width type changes., Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-4.0-testing] tmem: skip special case in alloc_heap_pages() if tmem holds no pages, Xen patchbot-4.0-testing
Indexes:	[Date] [Thread] [Top] [All Lists]