Changeset 76828 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 16, 2019 8:33:09 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128185

Message:

VMM/IEM: Nested VMX: bugref:9180 Restore host FS, GS base properly. It is only undefined is -both- the segment is ununsable AND the VM-exit is not to 64-bit mode.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2195 +2195 @@
             case X86_SREG_FS:
             {
-                Assert(X86_IS_CANONICAL(pVmcs->u64HostFsBase.u));
-                pVCpu->cpum.GstCtx.fs.u64Base = !fUnusable ? pVmcs->u64HostFsBase.u : 0;
+                if (   !fUnusable
+                    ||  fHostInLongMode)
+                {
+                    Assert(X86_IS_CANONICAL(pVmcs->u64HostFsBase.u));
+                    pVCpu->cpum.GstCtx.fs.u64Base = pVmcs->u64HostFsBase.u;
+                }
+                else
+                    pVCpu->cpum.GstCtx.fs.u64Base = 0;
                 pVCpu->cpum.GstCtx.fs.Attr.n.u4Type        = X86_SEL_TYPE_RW | X86_SEL_TYPE_ACCESSED;
                 pVCpu->cpum.GstCtx.fs.Attr.n.u1DescType    = 1;
@@ -2209 +2215 @@
             case X86_SREG_GS:
             {
-                Assert(X86_IS_CANONICAL(pVmcs->u64HostGsBase.u));
-                pVCpu->cpum.GstCtx.gs.u64Base = !fUnusable ? pVmcs->u64HostGsBase.u : 0;
+                if (   !fUnusable
+                    ||  fHostInLongMode)
+                {
+                    Assert(X86_IS_CANONICAL(pVmcs->u64HostGsBase.u));
+                    pVCpu->cpum.GstCtx.gs.u64Base = pVmcs->u64HostGsBase.u;
+                }
+                else
+                    pVCpu->cpum.GstCtx.gs.u64Base = 0;
                 pVCpu->cpum.GstCtx.gs.Attr.n.u4Type        = X86_SEL_TYPE_RW | X86_SEL_TYPE_ACCESSED;
                 pVCpu->cpum.GstCtx.gs.Attr.n.u1DescType    = 1;