From: Tim Deegan <Tim.Deegan@citrix.com>
Date: Mon, 14 Mar 2011 16:59:49 +0000 (+0000)
Subject: x86_64: fix error checking in arch_set_info_guest()
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d62b3c2276ae4caeb4674fe865061b04f0514e66;p=xen.git

x86_64: fix error checking in arch_set_info_guest()

Cannot specify user mode execution without specifying user-mode
pagetables.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index b859cd576f..72a3a0babf 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -820,6 +820,11 @@ int arch_set_info_guest(
 
             v->arch.guest_table_user = pagetable_from_pfn(cr3_pfn);
         }
+        else if ( !(flags & VGCF_in_kernel) )
+        {
+            destroy_gdt(v);
+            return -EINVAL;
+        }
     }
     else
     {