Changeset 52374 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Aug 13, 2014 10:23:44 PM (10 years ago)

Author:

vboxsync

Message:

SUP: x86 import fixes.

Location:

trunk/src/VBox/HostDrivers/Support/win

Files:

• SUPR3HardenedMainA-win.asm (modified) (1 diff)
• SUPR3HardenedMainImports-win.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainA-win.asm

@@ -129 +129 @@
         mov     edx, 07ffe0300h         ; SharedUserData!SystemCallStub
         mov     eax, [NAME(g_uApiNo %+ %1) xWrtRIP]
-        call    edx
+        call    dword [edx]
         ret     %2
 ENDPROC %1 %+ _SyscallType1

trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp

@@ -473 +473 @@
         && pbFunction[ 4] == 0x00)
     {
-        *pSyscall->puApiNo = RT_MAKE_U16(pbFunction[0], pbFunction[1]);
+        *pSyscall->puApiNo = RT_MAKE_U16(pbFunction[1], pbFunction[2]);
         if (   pbFunction[5] == 0xba /* mov edx, offset SharedUserData!SystemCallStub */
             && pbFunction[ 6] == 0x00
@@ -481 +481 @@
             && pbFunction[10] == 0xff /* call [edx] */
             && pbFunction[11] == 0x12
-            && pbFunction[12] == 0xc2 /* ret 1ch */
-            && pbFunction[13] == pSyscall->cbParams
-            && pbFunction[14] == 0x00)
+            && (   (   pbFunction[12] == 0xc2 /* ret 1ch */
+                    && pbFunction[13] == pSyscall->cbParams
+                    && pbFunction[14] == 0x00)
+                || (   pbFunction[12] == 0xc3 /* ret */
+                    && pSyscall->cbParams == 0)
+                )
+           )
         {
             *pImport->ppfnImport = pSyscall->pfnType1;
@@ -491 +495 @@
         if (   pbFunction[ 5] == 0xe8 /* call [$+3] */
             && RT_ABS(*(int32_t *)&pbFunction[6]) < 0x10
-            && pbFunction[10] == 0xc2 /* ret 1ch */
-            && pbFunction[11] == pSyscall->cbParams
-            && pbFunction[12] == 0x00)
+            && (   (   pbFunction[10] == 0xc2 /* ret 1ch */
+                    && pbFunction[11] == pSyscall->cbParams
+                    && pbFunction[12] == 0x00)
+                || (   pbFunction[12] == 0xc3 /* ret */
+                    && pSyscall->cbParams == 0)
+               )
+           )
         {
             *pImport->ppfnImport = pSyscall->pfnType2;