Changeset 77640 in vbox for trunk/src/VBox/Additions/os2/VBoxSF

Timestamp:

Mar 10, 2019 9:13:03 PM (6 years ago)

Author:

vboxsync

Message:

os2/vboxsf: KernStrToUcs and (probably also) KernStrFromUcs trashes ES in some cases (probably when they load a translation table, as it doesn't happen when JFS is actively used), so they need ES preserving wrappers to be safe to use. ticketref:18376 ticketref:18379

Location:

trunk/src/VBox/Additions/os2/VBoxSF

Files:

• VBoxSF.cpp (modified) (6 diffs)
• VBoxSFA.asm (modified) (2 diffs)
• VBoxSFFind.cpp (modified) (6 diffs)
• VBoxSFInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSF.cpp

@@ -505 +505 @@
     if (pDst)
     {
-        APIRET rc = KernStrToUcs(NULL, &pDst->String.utf16[0], (char *)pszFolderPath, cchSrc + 4, cchSrc);
+        APIRET rc = SafeKernStrToUcs(NULL, &pDst->String.utf16[0], (char *)pszFolderPath, cchSrc + 4, cchSrc);
         if (rc == NO_ERROR)
         {
@@ -525 +525 @@
             if (pDst)
             {
-                rc = KernStrToUcs(NULL, pDst->String.utf16, (char *)pszFolderPath, (cchSrc + 16) * 2, cchSrc);
+                rc = SafeKernStrToUcs(NULL, pDst->String.utf16, (char *)pszFolderPath, (cchSrc + 16) * 2, cchSrc);
                 if (rc == NO_ERROR)
                 {
@@ -535 +535 @@
                 }
                 VbglR0PhysHeapFree(pDst);
-                LogRel(("vboxSfOs2ConvertPath: KernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
+                LogRel(("vboxSfOs2ConvertPath: SafeKernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
             }
         }
         else
-            LogRel(("vboxSfOs2ConvertPath: KernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
+            LogRel(("vboxSfOs2ConvertPath: SafeKernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
     }
 
@@ -581 +581 @@
         PSHFLSTRING pDst = (PSHFLSTRING)((uint8_t *)pvBuf + offStrInBuf);
 
-        APIRET rc = KernStrToUcs(NULL, &pDst->String.utf16[0], (char *)pszFolderPath, cchSrc + 4, cchSrc);
+        APIRET rc = SafeKernStrToUcs(NULL, &pDst->String.utf16[0], (char *)pszFolderPath, cchSrc + 4, cchSrc);
         if (rc == NO_ERROR)
         {
@@ -604 +604 @@
                 pDst = (PSHFLSTRING)((uint8_t *)pvBuf + offStrInBuf);
 
-                rc = KernStrToUcs(NULL, pDst->String.utf16, (char *)pszFolderPath, (cchSrc + 16) * 2, cchSrc);
+                rc = SafeKernStrToUcs(NULL, pDst->String.utf16, (char *)pszFolderPath, (cchSrc + 16) * 2, cchSrc);
                 if (rc == NO_ERROR)
                 {
@@ -614 +614 @@
                 }
                 VbglR0PhysHeapFree(pDst);
-                LogRel(("vboxSfOs2ConvertPath: KernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
+                LogRel(("vboxSfOs2ConvertPath: SafeKernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
             }
         }
         else
-            LogRel(("vboxSfOs2ConvertPath: KernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
+            LogRel(("vboxSfOs2ConvertPath: SafeKernStrToUcs returns %#x for %.*Rhxs\n", rc, cchSrc, pszFolderPath));
     }
 

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFA.asm

@@ -509 +509 @@
 extern KernThunkStackTo16
 extern KernSelToFlat
+extern KernStrToUcs
+extern KernStrFromUcs
 segment CODE16
 extern FSH_FORCENOSWAP
@@ -1614 +1616 @@
 
 
+;
+;
+; Calling 32-bit kernel code.
+;
+;
+
+BEGINCODE
+
+;;
+; Wraps APIRET APIENTRY KernStrToUcs(PUconvObj, UniChar *, char *, LONG, LONG),
+; to preserve ES.  ES get trashed in some cases (probably conversion table init).
+;
+BEGINPROC   SafeKernStrToUcs
+DWARF_LABEL_TEXT32 NAME(SafeKernStrToUcs)
+        push    ebp
+        mov     ebp, esp
+        push    es
+        push    ds
+
+        push    dword [ebp + 18h]
+        push    dword [ebp + 14h]
+        push    dword [ebp + 10h]
+        push    dword [ebp + 0ch]
+        push    dword [ebp + 08h]
+        call    KernStrToUcs
+
+        lea     esp, [ebp - 8]
+        pop     ds
+        pop     es
+        cld                             ; just to be on the safe side
+        leave
+        ret
+ENDPROC     SafeKernStrToUcs
+
+
+;;
+; Wraps APIRET APIENTRY KernStrFromUcs(PUconvObj, char *, UniChar *, LONG, LONG),
+; to preserve ES.  ES get trashed in some cases (probably conversion table init).
+;
+BEGINPROC   SafeKernStrFromUcs
+DWARF_LABEL_TEXT32 NAME(SafeKernStrFromUcs)
+        push    ebp
+        mov     ebp, esp
+        push    es
+        push    ds
+
+        push    dword [ebp + 18h]
+        push    dword [ebp + 14h]
+        push    dword [ebp + 10h]
+        push    dword [ebp + 0ch]
+        push    dword [ebp + 08h]
+        call    KernStrFromUcs
+
+        lea     esp, [ebp - 8]
+        pop     ds
+        pop     es
+        cld                             ; just to be on the safe side
+        leave
+        ret
+ENDPROC     SafeKernStrFromUcs
+
 
 

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp

@@ -94 +94 @@
      * Conver to the native code page.
      */
-    APIRET rc = KernStrFromUcs(NULL, pszTmp, pwszName, cbTmp, cwcName);
+    APIRET rc = SafeKernStrFromUcs(NULL, pszTmp, pwszName, cbTmp, cwcName);
     if (rc != NO_ERROR)
     {
-        LogRel(("vboxSfOs2IsUtf8Name8dot3: KernStrFromUcs failed: %d\n", rc));
+        LogRel(("vboxSfOs2IsUtf8Name8dot3: SafeKernStrFromUcs failed: %d\n", rc));
         return false;
     }
@@ -134 +134 @@
 {
     char *pszDst = (char *)pbDst + 1;
-    APIRET rc = KernStrFromUcs(NULL, pszDst, pwszSrc, CCHMAXPATHCOMP, cwcSrc);
+    APIRET rc = SafeKernStrFromUcs(NULL, pszDst, pwszSrc, CCHMAXPATHCOMP, cwcSrc);
     if (rc == NO_ERROR)
     {
@@ -143 +143 @@
         return pbDst;
     }
-    LogRel(("vboxSfOs2CopyUtf8Name: KernStrFromUcs failed: %d\n", rc));
+    LogRel(("vboxSfOs2CopyUtf8Name: SafeKernStrFromUcs failed: %d\n", rc));
     return NULL;
 }
@@ -154 +154 @@
 {
     char *pszDst = (char *)(pbDst + 1);
-    APIRET rc = KernStrFromUcs(NULL, pszDst, RTUtf16ToUpper(pwszSrc), CCHMAXPATHCOMP, cwcSrc);
+    APIRET rc = SafeKernStrFromUcs(NULL, pszDst, RTUtf16ToUpper(pwszSrc), CCHMAXPATHCOMP, cwcSrc);
     if (rc == NO_ERROR)
     {
@@ -163 +163 @@
         return pbDst;
     }
-    LogRel(("vboxSfOs2CopyUtf16NameAndUpperCase: KernStrFromUcs failed: %#x\n", rc));
+    LogRel(("vboxSfOs2CopyUtf16NameAndUpperCase: SafeKernStrFromUcs failed: %#x\n", rc));
     return NULL;
 }
@@ -443 +443 @@
                PFSFSI pFsFsi, PVBOXSFFS pFsFsd, PBYTE pbData, ULONG cbData, PUSHORT pcMatches, ULONG uLevel, ULONG fFlags)
 {
-    LogFlow(("pCdFsi=%p pCdFsd=%p pszPath=%p:{%s} offCurDirEnd=%d fAttribs=%#x pFsFsi=%p pFsFsd=%p pbData=%p cbData=%#x pcMatches=%p:{%#x} uLevel=%#x fFlags=%#x\n",
+    LogFlow(("FS32_FINDFIRST: pCdFsi=%p pCdFsd=%p pszPath=%p:{%s} offCurDirEnd=%d fAttribs=%#x pFsFsi=%p pFsFsd=%p pbData=%p cbData=%#x pcMatches=%p:{%#x} uLevel=%#x fFlags=%#x\n",
              pCdFsi, pCdFsd, pszPath, pszPath, offCurDirEnd, fAttribs, pFsFsi, pFsFsd, pbData, cbData, pcMatches, *pcMatches, uLevel, fFlags));
     USHORT const cMaxMatches = *pcMatches;

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFInternal.h

@@ -248 +248 @@
 APIRET      vboxSfOs2MakeEmptyEaListEx(PEAOP pEaOp, ULONG uLevel, uint32_t *pcbWritten, ULONG *poffError);
 
-DECLASM(PVBOXSFVP) Fsh32GetVolParams(USHORT hVbp, PVPFSI *ppVpFsi /*optional*/);
+DECLASM(PVBOXSFVP)  Fsh32GetVolParams(USHORT hVbp, PVPFSI *ppVpFsi /*optional*/);
+DECLASM(APIRET)     SafeKernStrToUcs(PUconvObj, UniChar *, char *, LONG, LONG);
+DECLASM(APIRET)     SafeKernStrFromUcs(PUconvObj, char *, UniChar *, LONG, LONG);