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

Timestamp:

Jun 13, 2009 8:58:04 PM (15 years ago)

Author:

vboxsync

Message:

VMMR0A.asm: More sanity checks.

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0A.asm (modified) (8 diffs)

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

@@ -81 +81 @@
     jz      .entry_error
  %ifdef VBOX_STRICT
-    mov      edx, esi
-    mov      edi, esi
-    mov      ecx, 2048
-    mov      eax, 0eeeeeeeeh
+    cmp     dword [esi], 0h
+    jne     .entry_error
+    mov     edx, esi
+    mov     edi, esi
+    mov     ecx, 2048
+    mov     eax, 0eeeeeeeeh
     repne stosd
  %endif
@@ -101 +103 @@
     and     dword [esi + 1ch], byte 0   ; clear marker.
 
+ %ifdef VBOX_STRICT
+    mov     esi, [ebx + VMMR0JMPBUF.pvSavedStack]
+    cmp     [esi], 0eeeeeeeeh           ; Check for stack overflow
+    jne     .stack_overflow
+    cmp     [esi + 04h], 0eeeeeeeeh
+    jne     .stack_overflow
+    cmp     [esi + 08h], 0eeeeeeeeh
+    jne     .stack_overflow
+    cmp     [esi + 0ch], 0eeeeeeeeh
+    jne     .stack_overflow
+    cmp     [esi + 10h], 0eeeeeeeeh
+    jne     .stack_overflow
+    cmp     [esi + 20h], 0eeeeeeeeh
+    jne     .stack_overflow
+    cmp     [esi + 30h], 0eeeeeeeeh
+    jne     .stack_overflow
+    mov     dword [esi], 0h             ; Reset the marker
+ %endif
+
 %else  ; !VMM_R0_SWITCH_STACK
     mov     ecx, [esp + 0ch]            ; pvArg1
@@ -129 +150 @@
     jmp     .proper_return
 
-    ;
-    ; Resume VMMR0CallHost the call.
-    ;
-.resume:
-%ifdef VMM_R0_SWITCH_STACK
-    ; Switch stack.
-    mov     esp, [edx + VMMR0JMPBUF.SpResume]
-%else  ; !VMM_R0_SWITCH_STACK
-    ; Sanity checks.
-    cmp     ecx, [edx + VMMR0JMPBUF.SpCheck]
-    je      .espCheck_ok
+.stack_overflow:
+    mov     eax, VERR_INTERNAL_ERROR_5
+    jmp     .proper_return
+
+    ;
+    ; Aborting resume.
+    ;
 .bad:
     and     dword [edx + VMMR0JMPBUF.eip], byte 0 ; used for valid check.
@@ -148 +165 @@
     ret
 
+    ;
+    ; Resume VMMR0CallHost the call.
+    ;
+.resume:
+    ; Sanity checks.
+%ifdef VMM_R0_SWITCH_STACK
+    mov     eax, [edx + VMMR0JMPBUF.pvSavedStack]
+ %ifdef RT_STRICT
+    cmp     dword [eax], 0eeeeeeeeh
+ %endif
+    lea     eax, [eax + 8192 - 32]
+    cmp     dword [eax + 1ch], 0deadbeefh       ; Marker 1.
+    jne     .bad
+ %ifdef RT_STRICT
+    cmp     [esi + 18h], edx                    ; The saved pJmpBuf pointer.
+    jne     .bad
+    cmp     dword [esi + 14h], 00c00ffeeh       ; Marker 2.
+    jne     .bad
+    cmp     dword [esi + 10h], 0f00dbeefh       ; Marker 3.
+    jne     .bad
+ %endif
+%else  ; !VMM_R0_SWITCH_STACK
+    cmp     ecx, [edx + VMMR0JMPBUF.SpCheck]
+    jne     .bad
 .espCheck_ok:
     mov     ecx, [edx + VMMR0JMPBUF.cbSavedStack]
@@ -158 +199 @@
     cmp     ecx, edi
     jne     .bad
-
-    ;
+%endif
+
+%ifdef VMM_R0_SWITCH_STACK
+    ; Switch stack.
+    mov     esp, [edx + VMMR0JMPBUF.SpResume]
+%else
     ; Restore the stack.
-    ;
     mov     ecx, [edx + VMMR0JMPBUF.cbSavedStack]
     shr     ecx, 2
@@ -171 +215 @@
     mov     byte [edx + VMMR0JMPBUF.fInRing3Call], 0
 
-    ;
     ; Continue where we left off.
-    ;
 %ifdef VBOX_STRICT
     pop     eax                         ; magic
@@ -235 +277 @@
     jz      .entry_error
   %ifdef VBOX_STRICT
+    cmp     dword [r15], 0h
+    jne     .entry_error
     mov     rdi, r15
     mov     rcx, 1024
@@ -255 +299 @@
     call    r11
     mov     rdx, r12                    ; Restore pJmpBuf
+
+ %ifdef VMM_R0_SWITCH_STACK
+  %ifdef VBOX_STRICT
+    mov     r15, [rdx + VMMR0JMPBUF.pvSavedStack]
+    mov     dword [r15], 0h             ; Reset the marker
+  %endif
+ %endif
 
     ;