Changeset 48318 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 5, 2013 5:15:49 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HM: Fix incorrect jump causing panic while restoring GS in VT-x.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0A.asm (modified) (4 diffs)
• HMR0Mixed.mac (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -313 +313 @@
     jz          .test_es
     mov         ax, [rsi + VMXRESTOREHOST.uHostSelDS]
-    mov         ds, ax
+    mov         ds, eax
 
 .test_es:
@@ -319 +319 @@
     jz          .test_tr
     mov         ax, [rsi + VMXRESTOREHOST.uHostSelES]
-    mov         es, ax
+    mov         es, eax
 
 .test_tr:
@@ -350 +350 @@
     jz          .test_gs
     mov         ax, word [rsi + VMXRESTOREHOST.uHostSelFS]
-    mov         fs, ax
+    mov         fs, eax
     mov         eax, dword [rsi + VMXRESTOREHOST.uHostFSBase]         ; uHostFSBase - Lo
     mov         edx, dword [rsi + VMXRESTOREHOST.uHostFSBase + 4h]    ; uHostFSBase - Hi
@@ -356 +356 @@
     wrmsr
 
+.test_gs:
     test        edi, VMX_RESTORE_HOST_SEL_GS
     jz          .restore_flags
-.test_gs:
     mov         ax, word [rsi + VMXRESTOREHOST.uHostSelGS]
-    mov         gs, ax
+    mov         gs, eax
     mov         eax, dword [rsi + VMXRESTOREHOST.uHostGSBase]         ; uHostGSBase - Lo
     mov         edx, dword [rsi + VMXRESTOREHOST.uHostGSBase + 4h]    ; uHostGSBase - Hi

trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac

@@ -89 +89 @@
     pop     xAX         ; Saved LDTR
  %ifdef RT_ARCH_AMD64
-    cmp     xAX, 0
+    cmp     eax, 0
     je      .skipldtwrite32%1
  %endif
@@ -351 +351 @@
 
     pop     xAX         ; Saved LDTR
-    cmp     xAX, 0
+    cmp     eax, 0
     je      .skipldtwrite64%1
     lldt    ax
@@ -382 +382 @@
     mov     eax, [xDX + VMCSCACHE.Read.aField + xCX * 4]
     vmread  [xDX + VMCSCACHE.Read.aFieldVal + xCX * 8], xAX
-    cmp      xCX, 0
+    cmp     xCX, 0
     jnz     .cached_read64%3
 .no_cached_read64%2: