From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 27 May 2014 10:39:23 +0000 (+0200)
Subject: target-i386: test reserved PS bit on PML4Es
X-Git-Tag: v2.1.0-rc0~85^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b728464ae823a220d3b698d2ce055b2ceec0e297;p=thirdparty%2Fqemu.git

target-i386: test reserved PS bit on PML4Es

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/target-i386/helper.c b/target-i386/helper.c
index a8e4088b02f..787fbba9fe4 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -580,6 +580,9 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
             if (!(pml4e & PG_PRESENT_MASK)) {
                 goto do_fault;
             }
+            if (pml4e & PG_PSE_MASK) {
+                goto do_fault_rsvd;
+            }
             if (!(env->efer & MSR_EFER_NXE) && (pml4e & PG_NX_MASK)) {
                 goto do_fault_rsvd;
             }