From: ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Mon, 2 Apr 2007 08:56:24 +0000 (+0000)
Subject: ltr for x86_64 should check the upper descriptor type, by Bernhard Kauer.
X-Git-Tag: release_0_9_1~1315
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0ee3ff06e54a30b1540c08507b873a00192aa0e;p=thirdparty%2Fqemu.git

ltr for x86_64 should check the upper descriptor type, by Bernhard Kauer.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2582 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 70370fca294..aa136707e64 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1864,8 +1864,11 @@ void helper_ltr_T0(void)
             raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc);
 #ifdef TARGET_X86_64
         if (env->hflags & HF_LMA_MASK) {
-            uint32_t e3;
+            uint32_t e3, e4;
             e3 = ldl_kernel(ptr + 8);
+            e4 = ldl_kernel(ptr + 12);
+            if ((e4 >> DESC_TYPE_SHIFT) & 0xf)
+                raise_exception_err(EXCP0D_GPF, selector & 0xfffc);
             load_seg_cache_raw_dt(&env->tr, e1, e2);
             env->tr.base |= (target_ulong)e3 << 32;
         } else