Changeset 99483 in vbox

Timestamp:

Apr 20, 2023 10:16:10 AM (20 months ago)

Author:

vboxsync

Message:

IPRT/RTProcCreateEx: More fixes for the initial patch supplied; also tweaked the testcases a little. bugref:8053

Location:

trunk/src/VBox/Runtime

Files:

• r3/posix/process-creation-posix.cpp (modified) (1 diff)
• r3/win/process-win.cpp (modified) (5 diffs)
• testcase/tstRTProcCreateEx.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp

@@ -1713 +1713 @@
         return VERR_PROC_DETACH_NOT_SUPPORTED;
 #endif
-    AssertReturn(pvExtraData == NULL || (fFlags & (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_CWD)),
-                 VERR_INVALID_PARAMETER);
-    AssertReturn((fFlags & (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_CWD)) != (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_CWD),
-                 VERR_INVALID_PARAMETER);
+
+    /* Extra data: */
+    if (fFlags & RTPROC_FLAGS_CWD)
+    {
+        AssertPtrReturn(pvExtraData, VERR_INVALID_POINTER);
+    }
+    else
+        AssertReturn(pvExtraData == NULL, VERR_INVALID_PARAMETER);
+    /* Note: Windows-specific flags will be quietly ignored. */
 
     /*

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -2262 +2262 @@
                                const char *pszPassword, void *pvExtraData, PRTPROCESS phProcess)
 {
-    int rc;
-
     /*
      * Input validation
@@ -2279 +2277 @@
 
     /* Extra data: */
+    AssertReturn(   pvExtraData == NULL
+                 || (fFlags & (   RTPROC_FLAGS_DESIRED_SESSION_ID
+                               | RTPROC_FLAGS_TOKEN_SUPPLIED
+                               | RTPROC_FLAGS_CWD)),
+                 VERR_INVALID_PARAMETER);
+
     uint32_t idDesiredSession = UINT32_MAX;
     if (   (fFlags & (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_SERVICE))
         ==           (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_SERVICE))
     {
-        AssertReturn(!(fFlags & RTPROC_FLAGS_CWD), VERR_INVALID_PARAMETER);
+        AssertReturn(!(fFlags & (  RTPROC_FLAGS_TOKEN_SUPPLIED
+                                 | RTPROC_FLAGS_CWD)),
+                     VERR_INVALID_PARAMETER);
         AssertPtrReturn(pvExtraData, VERR_INVALID_POINTER);
         idDesiredSession = *(uint32_t *)pvExtraData;
@@ -2289 +2295 @@
     else
         AssertReturn(!(fFlags & RTPROC_FLAGS_DESIRED_SESSION_ID), VERR_INVALID_FLAGS);
+
+    if (fFlags & RTPROC_FLAGS_CWD)
+    {
+        AssertReturn(!(fFlags & (  RTPROC_FLAGS_DESIRED_SESSION_ID
+                                 | RTPROC_FLAGS_TOKEN_SUPPLIED)),
+                     VERR_INVALID_PARAMETER);
+        AssertPtrReturn(pvExtraData, VERR_INVALID_POINTER);
+    }
 
     HANDLE hUserToken = NULL;
@@ -2297 +2311 @@
      * Initialize the globals.
      */
-    rc = RTOnce(&g_rtProcWinInitOnce, rtProcWinInitOnce, NULL);
+    int rc = RTOnce(&g_rtProcWinInitOnce, rtProcWinInitOnce, NULL);
     AssertRCReturn(rc, rc);
     if (   pszAsUser
@@ -2436 +2450 @@
                                        !(fFlags & RTPROC_FLAGS_UNQUOTED_ARGS)
                                        ? RTGETOPTARGV_CNV_QUOTE_MS_CRT : RTGETOPTARGV_CNV_UNQUOTED);
-    PRTUTF16 pwszExec = NULL;
     if (RT_SUCCESS(rc))
+    {
+        PRTUTF16 pwszExec = NULL;
         rc = RTPathWinFromUtf8(&pwszExec, pszExec, 0 /*fFlags*/);
-    PRTUTF16 pwszCwd = NULL;
-    if (RT_SUCCESS(rc) && (fFlags & RTPROC_FLAGS_CWD))
-        rc = RTPathWinFromUtf8(&pwszCwd, (const char *)pvExtraData, 0);
-    if (RT_SUCCESS(rc))
-    {
-            /*
-             * Get going...
-             */
-            PROCESS_INFORMATION ProcInfo;
-            RT_ZERO(ProcInfo);
-            DWORD dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
-            if (fFlags & RTPROC_FLAGS_DETACHED)
-                dwCreationFlags |= DETACHED_PROCESS;
-            if (fFlags & RTPROC_FLAGS_NO_WINDOW)
-                dwCreationFlags |= CREATE_NO_WINDOW;
-
-            /*
-             * Only use the normal CreateProcess stuff if we have no user name
-             * and we are not running from a (Windows) service. Otherwise use
-             * the more advanced version in rtProcWinCreateAsUser().
-             */
-            if (   pszAsUser == NULL
-                && !(fFlags & (RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN | RTPROC_FLAGS_TOKEN_SUPPLIED)))
+        if (RT_SUCCESS(rc))
+        {
+            PRTUTF16 pwszCwd = NULL;
+            if (fFlags & RTPROC_FLAGS_CWD)
+                rc = RTPathWinFromUtf8(&pwszCwd, (const char *)pvExtraData, 0);
+            if (RT_SUCCESS(rc))
             {
-                /* Create the environment block first. */
-                PRTUTF16 pwszzBlock;
-                rc = rtProcWinCreateEnvBlockAndFindExe(fFlags, hEnv, pszExec, &pwszzBlock, &pwszExec);
+                /*
+                 * Get going...
+                 */
+                PROCESS_INFORMATION ProcInfo;
+                RT_ZERO(ProcInfo);
+                DWORD dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
+                if (fFlags & RTPROC_FLAGS_DETACHED)
+                    dwCreationFlags |= DETACHED_PROCESS;
+                if (fFlags & RTPROC_FLAGS_NO_WINDOW)
+                    dwCreationFlags |= CREATE_NO_WINDOW;
+
+                /*
+                 * Only use the normal CreateProcess stuff if we have no user name
+                 * and we are not running from a (Windows) service. Otherwise use
+                 * the more advanced version in rtProcWinCreateAsUser().
+                 */
+                if (   pszAsUser == NULL
+                    && !(fFlags & (RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_AS_IMPERSONATED_TOKEN | RTPROC_FLAGS_TOKEN_SUPPLIED)))
+                {
+                    /* Create the environment block first. */
+                    PRTUTF16 pwszzBlock;
+                    rc = rtProcWinCreateEnvBlockAndFindExe(fFlags, hEnv, pszExec, &pwszzBlock, &pwszExec);
+                    if (RT_SUCCESS(rc))
+                    {
+                        if (CreateProcessW(pwszExec,
+                                           pwszCmdLine,
+                                           NULL,         /* pProcessAttributes */
+                                           NULL,         /* pThreadAttributes */
+                                           TRUE,         /* fInheritHandles */
+                                           dwCreationFlags,
+                                           pwszzBlock,
+                                           pwszCwd,       /* pCurrentDirectory */
+                                           &StartupInfo,
+                                           &ProcInfo))
+                            rc = VINF_SUCCESS;
+                        else
+                            rc = RTErrConvertFromWin32(GetLastError());
+                        RTEnvFreeUtf16Block(pwszzBlock);
+                    }
+                }
+                else
+                {
+                    /*
+                     * Convert the additional parameters and use a helper
+                     * function to do the actual work.
+                     */
+                    PRTUTF16 pwszUser = NULL;
+                    if (pszAsUser)
+                        rc = RTStrToUtf16(pszAsUser, &pwszUser);
+                    if (RT_SUCCESS(rc))
+                    {
+                        PRTUTF16 pwszPassword;
+                        rc = RTStrToUtf16(pszPassword ? pszPassword : "", &pwszPassword);
+                        if (RT_SUCCESS(rc))
+                        {
+                            rc = rtProcWinCreateAsUser(pwszUser, pwszPassword, &pwszExec, pwszCmdLine, hEnv, dwCreationFlags,
+                                                       &StartupInfo, &ProcInfo, fFlags, pszExec, idDesiredSession,
+                                                       hUserToken, pwszCwd);
+
+                            if (pwszPassword && *pwszPassword)
+                                RTMemWipeThoroughly(pwszPassword, RTUtf16Len(pwszPassword), 5);
+                            RTUtf16Free(pwszPassword);
+                        }
+                        RTUtf16Free(pwszUser);
+                    }
+                }
                 if (RT_SUCCESS(rc))
                 {
-                    if (CreateProcessW(pwszExec,
-                                       pwszCmdLine,
-                                       NULL,         /* pProcessAttributes */
-                                       NULL,         /* pThreadAttributes */
-                                       TRUE,         /* fInheritHandles */
-                                       dwCreationFlags,
-                                       pwszzBlock,
-                                       pwszCwd,       /* pCurrentDirectory */
-                                       &StartupInfo,
-                                       &ProcInfo))
-                        rc = VINF_SUCCESS;
-                    else
-                        rc = RTErrConvertFromWin32(GetLastError());
-                    RTEnvFreeUtf16Block(pwszzBlock);
-                }
-            }
-            else
-            {
-                /*
-                 * Convert the additional parameters and use a helper
-                 * function to do the actual work.
-                 */
-                PRTUTF16 pwszUser = NULL;
-                if (pszAsUser)
-                    rc = RTStrToUtf16(pszAsUser, &pwszUser);
-                if (RT_SUCCESS(rc))
-                {
-                    PRTUTF16 pwszPassword;
-                    rc = RTStrToUtf16(pszPassword ? pszPassword : "", &pwszPassword);
-                    if (RT_SUCCESS(rc))
+                    CloseHandle(ProcInfo.hThread);
+                    if (phProcess)
                     {
-                        rc = rtProcWinCreateAsUser(pwszUser, pwszPassword, &pwszExec, pwszCmdLine, hEnv, dwCreationFlags,
-                                                   &StartupInfo, &ProcInfo, fFlags, pszExec, idDesiredSession,
-                                                   hUserToken, pwszCwd);
-
-                        if (pwszPassword && *pwszPassword)
-                            RTMemWipeThoroughly(pwszPassword, RTUtf16Len(pwszPassword), 5);
-                        RTUtf16Free(pwszPassword);
+                        /*
+                         * Add the process to the child process list so RTProcWait can reuse and close
+                         * the process handle, unless, of course, the caller has no intention waiting.
+                         */
+                        if (!(fFlags & RTPROC_FLAGS_NO_WAIT))
+                            rtProcWinAddPid(ProcInfo.dwProcessId, ProcInfo.hProcess);
+                        else
+                            CloseHandle(ProcInfo.hProcess);
+                        *phProcess = ProcInfo.dwProcessId;
                     }
-                    RTUtf16Free(pwszUser);
-                }
-            }
-            if (RT_SUCCESS(rc))
-            {
-                CloseHandle(ProcInfo.hThread);
-                if (phProcess)
-                {
-                    /*
-                     * Add the process to the child process list so RTProcWait can reuse and close
-                     * the process handle, unless, of course, the caller has no intention waiting.
-                     */
-                    if (!(fFlags & RTPROC_FLAGS_NO_WAIT))
-                        rtProcWinAddPid(ProcInfo.dwProcessId, ProcInfo.hProcess);
                     else
                         CloseHandle(ProcInfo.hProcess);
-                    *phProcess = ProcInfo.dwProcessId;
+                    rc = VINF_SUCCESS;
                 }
-                else
-                    CloseHandle(ProcInfo.hProcess);
-                rc = VINF_SUCCESS;
+
+                RTPathWinFree(pwszCwd);
             }
-    }
-    RTPathWinFree(pwszExec);
-    RTPathWinFree(pwszCwd);
-    RTUtf16Free(pwszCmdLine);
+            RTPathWinFree(pwszExec);
+        }
+        RTUtf16Free(pwszCmdLine);
+    }
 
     if (g_pfnSetHandleInformation)

trunk/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp

@@ -107 +107 @@
     const char *pszCWD = argv[2];
 
+    RTStrmPrintf(g_pStdOut, "childcwd: Called with CWD '%s'\n", pszCWD);
+
+    if (!RTStrICmp(pszCWD, "<cwd-not-specified>")) /* Bail out early if no CWD has been explicitly specified. */
+        return RTEXITCODE_SUCCESS;
+
     /* Validate if we really are in the CWD the parent told us. */
     char szCWD[RTPATH_MAX];
@@ -155 +160 @@
         g_szExecName,
         "--testcase-child-cwd",
-        "<invalid-cwd>",
+        "<cwd-not-specified>",
         pszAsUser,
         NULL
@@ -171 +176 @@
                           VERR_INVALID_PARAMETER);
 
+    /* Invalid flag combinations. Windows flags ignored elsewhere. */
+#ifdef RT_OS_WINDOWS
+    int rc = VERR_INVALID_PARAMETER;
+#else
+    int rc = VERR_INVALID_POINTER; /* Due to missing pvExtraData. */
+#endif
+    fFlags = RTPROC_FLAGS_CWD | RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_SERVICE;
+    RTTESTI_CHECK_RC_RETV(RTProcCreateEx(g_szExecName, apszArgs, RTENV_DEFAULT, fFlags,
+                                         NULL, NULL, NULL, pszAsUser, pszPassword,
+                                         NULL, &hProc), rc);
+
+    /* Windows-only flags. Ignored elsewhere. */
+#ifdef RT_OS_WINDOWS
+    rc = VERR_INVALID_POINTER;
+#else
+    rc = VINF_SUCCESS;
+#endif
+    fFlags = RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_SERVICE;
+    RTTESTI_CHECK_RC_RETV(RTProcCreateEx(g_szExecName, apszArgs, RTENV_DEFAULT, fFlags,
+                                         NULL, NULL, NULL, pszAsUser, pszPassword,
+                                         NULL, &hProc), rc);
+
     /* RTPROC_FLAGS_CWD set, but CWD missing as pvExtradata. */
     fFlags = RTPROC_FLAGS_CWD;
@@ -176 +203 @@
                                          NULL, NULL, NULL, pszAsUser, pszPassword,
                                          NULL, &hProc),
-                          VINF_SUCCESS);
-
-    /* CWD is "<invalid-cwd>" from above, should fail. */
-    RTPROCSTATUS ProcStatus = { -1, RTPROCEXITREASON_ABEND };
-    RTTESTI_CHECK_RC(RTProcWait(hProc, RTPROCWAIT_FLAGS_BLOCK, &ProcStatus), VINF_SUCCESS);
+                          VERR_INVALID_POINTER);
 
     char szCWD[RTPATH_MAX];
@@ -193 +216 @@
                                          (void *)szCWD /* pvExtraData (CWD) */, &hProc),
                           VINF_SUCCESS);
+    RTPROCSTATUS ProcStatus = { -1, RTPROCEXITREASON_ABEND };
     RTTESTI_CHECK_RC(RTProcWait(hProc, RTPROCWAIT_FLAGS_BLOCK, &ProcStatus), VINF_SUCCESS);
     if (ProcStatus.enmReason != RTPROCEXITREASON_NORMAL || ProcStatus.iStatus != 0)