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

Timestamp:

Jul 7, 2014 9:46:57 PM (11 years ago)

Author:

vboxsync

Message:

SUPR3HardenedVerify.cpp: Two more cases of CreateFileW with UTF-16.

File:

• trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -385 +385 @@
     if (RT_SUCCESS(rc))
     {
-#if defined(RT_OS_WINDOWS) /** @todo use CreateFileW */
-        HANDLE hDir = CreateFile(szPath,
-                                 GENERIC_READ,
-                                 FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE,
-                                 NULL,
-                                 OPEN_EXISTING,
-                                 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS,
-                                 NULL);
-        if (hDir != INVALID_HANDLE_VALUE)
+#if defined(RT_OS_WINDOWS)
+        PRTUTF16 pwszPath;
+        rc = RTStrToUtf16(szPath, &pwszPath);
+        if (RT_SUCCESS(rc))
         {
-            /** @todo check the type */
-            /* That's all on windows, for now at least... */
-            g_aSupVerifiedDirs[enmDir].hDir = (intptr_t)hDir;
-            g_aSupVerifiedDirs[enmDir].fValidated = true;
-        }
-        else if (enmDir == kSupID_Testcase)
-        {
-            g_aSupVerifiedDirs[enmDir].fValidated = true;
-            rc = VINF_SUCCESS; /* Optional directory, ignore if missing. */
+            HANDLE hDir = CreateFileW(pwszPath,
+                                      GENERIC_READ,
+                                      FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE,
+                                      NULL,
+                                      OPEN_EXISTING,
+                                      FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS,
+                                      NULL);
+            if (hDir != INVALID_HANDLE_VALUE)
+            {
+                /** @todo check the type */
+                /* That's all on windows, for now at least... */
+                g_aSupVerifiedDirs[enmDir].hDir = (intptr_t)hDir;
+                g_aSupVerifiedDirs[enmDir].fValidated = true;
+            }
+            else if (enmDir == kSupID_Testcase)
+            {
+                g_aSupVerifiedDirs[enmDir].fValidated = true;
+                rc = VINF_SUCCESS; /* Optional directory, ignore if missing. */
+            }
+            else
+            {
+                int err = GetLastError();
+                rc = supR3HardenedError(VERR_PATH_NOT_FOUND, fFatal,
+                                        "supR3HardenedVerifyDir: Failed to open \"%s\": err=%d\n",
+                                        szPath, err);
+            }
+            RTUtf16Free(pwszPath);
         }
         else
-        {
-            int err = GetLastError();
-            rc = supR3HardenedError(VERR_PATH_NOT_FOUND, fFatal,
-                                    "supR3HardenedVerifyDir: Failed to open \"%s\": err=%d\n",
-                                    szPath, err);
-        }
+            rc = supR3HardenedError(rc, fFatal,
+                                    "supR3HardenedVerifyDir: Failed to convert \"%s\" to UTF-16: err=%d\n", szPath, rc);
+
 #else /* UNIXY */
         int fd = open(szPath, O_RDONLY, 0);
@@ -519 +529 @@
         if (RT_SUCCESS(rc))
         {
-#if defined(RT_OS_WINDOWS) /** @todo Need to use WCHAR on windows! */
+#if defined(RT_OS_WINDOWS)
             PRTUTF16 pwszPath;
             rc = RTStrToUtf16(szPath, &pwszPath);
@@ -1573 +1583 @@
      * The files shall be signed on windows, verify that.
      */
+    rc = VINF_SUCCESS;
     HANDLE hVerify;
-    if (hNativeFile == RTHCUINTPTR_MAX) /** @todo Need to use WCHAR on windows! */
-        hVerify = CreateFile(pszFilename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hNativeFile == RTHCUINTPTR_MAX)
+    {
+        PRTUTF16 pwszPath;
+        rc = RTStrToUtf16(pszFilename, &pwszPath);
+        if (RT_SUCCESS(rc))
+        {
+            hVerify = CreateFileW(pwszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+            RTUtf16Free(pwszPath);
+        }
+        else
+            rc = RTErrInfoSetF(pErrInfo, rc, "Error converting '%s' to UTF-16: %Rrc", pszFilename, rc);
+    }
     else if (!DuplicateHandle(GetCurrentProcess(), (HANDLE)hNativeFile, GetCurrentProcess(), &hVerify,
                               GENERIC_READ, false /*bInheritHandle*/, 0 /*dwOptions*/))
@@ -1599 +1620 @@
         CloseHandle(hVerify);
     }
-    else
+    else if (RT_SUCCESS(rc))
         rc = RTErrInfoSetF(pErrInfo, RTErrConvertFromWin32(GetLastError()),
                            "Error %u trying to open (or duplicate handle for) '%s'", GetLastError(), pszFilename);