Changeset 83508 in vbox for trunk

Timestamp:

Apr 1, 2020 4:24:33 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Resolved another @todo: Added ability for guest processes to use argv[0] independently of the actual execution command (follow-up to r136639). ​​bugref:9320

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlProcess.cpp (modified) (7 diffs)
• VBoxServiceControlSession.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1039 +1039 @@
  *
  * @return IPRT status code.
- * @param  pszArgv0         First argument (argv0), either original or modified version.  Optional.
+ * @param  pszArgv0         First argument (argv0), either original or modified version.
  * @param  papszArgs        Original argv command line from the host, starting at argv[1].
  * @param  fFlags           The process creation flags pass to us from the host.
@@ -1048 +1048 @@
                                            char ***ppapszArgv)
 {
-    AssertPtrReturn(ppapszArgv, VERR_INVALID_POINTER);
-
     VGSvcVerbose(3, "VGSvcGstCtrlProcessPrepareArgv: pszArgv0=%p, papszArgs=%p, fFlags=%#x, ppapszArgv=%p\n",
                  pszArgv0, papszArgs, fFlags, ppapszArgv);
+
+    AssertPtrReturn(pszArgv0,   VERR_INVALID_POINTER);
+    AssertPtrReturn(ppapszArgv, VERR_INVALID_POINTER);
 
     int rc = VINF_SUCCESS;
@@ -1067 +1068 @@
         return VERR_NO_MEMORY;
 
+    VGSvcVerbose(3, "VGSvcGstCtrlProcessAllocateArgv: pszArgv0 = '%s', cArgs=%RU32, cbSize=%zu\n", pszArgv0, cArgs, cbSize);
 #ifdef DEBUG /* Never log this stuff in release mode! */
-    VGSvcVerbose(3, "VGSvcGstCtrlProcessAllocateArgv: pszArgv0 = '%s'\n", pszArgv0);
-    for (uint32_t i = 0; i < cArgs; i++)
-        VGSvcVerbose(3, "VGSvcGstCtrlProcessAllocateArgv: papszArgs[%RU32] = '%s'\n", i, papszArgs[i]);
-    VGSvcVerbose(3, "VGSvcGstCtrlProcessAllocateArgv: cbSize=%RU32, cArgs=%RU32\n", cbSize, cArgs);
+    if (cArgs)
+    {
+        for (uint32_t i = 0; i < cArgs; i++)
+            VGSvcVerbose(3, "VGSvcGstCtrlProcessAllocateArgv: papszArgs[%RU32] = '%s'\n", i, papszArgs[i]);
+    }
 #endif
 
@@ -1081 +1084 @@
         || !strpbrk(pszArgv0, " \t\n\r")
         || pszArgv0[0] == '"')
+    {
         rc = RTStrDupEx(&papszNewArgv[0], pszArgv0);
+    }
     else
     {
         size_t cchArgv0 = strlen(pszArgv0);
+        AssertReturn(cchArgv0, VERR_INVALID_PARAMETER); /* Paranoia. */
         rc = RTStrAllocEx(&papszNewArgv[0], 1 + cchArgv0 + 1 + 1);
         if (RT_SUCCESS(rc))
@@ -1349 +1355 @@
          *
          * - If the host does not provide a dedicated argv[0] (< VBox 6.1.x), we use the
-         *   executable name (pszExec) as the (default) argv[0]. This is wrong, but we can't do
+         *   unmodified executable name (pszExec) as the (default) argv[0]. This is wrong, but we can't do
          *   much about it. The rest (argv[1,2,n]) then gets set starting at papszArgs[0].
          *
@@ -1357 +1363 @@
         const bool fHasArgv0 = RT_BOOL(g_fControlHostFeatures0 & VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0);
 
+        const char *pcszArgv0 = (fHasArgv0 && papszArgs[0]) ? papszArgs[0] : pszExec;
+        AssertPtrReturn(pcszArgv0, VERR_INVALID_POINTER); /* Paranoia. */
+
+        const char * const *pcszArgvN = fHasArgv0 && papszArgs + 1 ? papszArgs + 1 : papszArgs;
+        AssertPtrReturn(pcszArgvN, VERR_INVALID_POINTER); /* Ditto. */
+
+        VGSvcVerbose(3, "vgsvcGstCtrlProcessCreateProcess: fHasArgv0=%RTbool, pcszArgv0=%p, pcszArgvN=%p, g_fControlHostFeatures0=%#x\n",
+                     fHasArgv0, pcszArgv0, pcszArgvN, g_fControlHostFeatures0);
+
         char **papszArgsExp;
-        rc = vgsvcGstCtrlProcessAllocateArgv(fHasArgv0 ?  papszArgs[0] :  pszExec,
-                                             fHasArgv0 ? &papszArgs[1] : &papszArgs[0],
-                                             fFlags, &papszArgsExp);
+        rc = vgsvcGstCtrlProcessAllocateArgv(pcszArgv0, pcszArgvN, fFlags, &papszArgsExp);
         if (RT_FAILURE(rc))
         {
@@ -1526 +1539 @@
 
 #ifdef VBOX_STRICT
-    const bool fHasArgv0 = RT_BOOL(g_fControlHostFeatures0 & VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0);
+    const bool fHasArgv0    = RT_BOOL(g_fControlHostFeatures0 & VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0); RT_NOREF(fHasArgv0);
+    const int  cArgsToCheck = cArgs; /** @ŧodo Do we still need to do this?    + (fHasArgv0 ? 0 : 1); */
 
     /* Did we get the same result?
      * Take into account that we might not have supplied a (correct) argv[0] from the host. */
-    AssertMsg((int)pProcess->StartupInfo.uNumArgs == cArgs + fHasArgv0 ? 0 : 1,
-              ("StartupInfo.uNumArgs=%RU32 != cArgs=%d, fHostFeatures0=%#x\n",
-               pProcess->StartupInfo.uNumArgs, cArgs, g_fControlHostFeatures0));
+    AssertMsg((int)pProcess->StartupInfo.uNumArgs == cArgsToCheck,
+              ("rc=%Rrc, StartupInfo.uNumArgs=%RU32 != cArgsToCheck=%d, cArgs=%d, fHostFeatures0=%#x\n",
+               rc, pProcess->StartupInfo.uNumArgs, cArgsToCheck, cArgs, g_fControlHostFeatures0));
 #endif
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1720 +1720 @@
     g_fControlSupportsOptimizations = VbglR3GuestCtrlSupportsOptimizations(idClient);
     g_idControlSvcClient            = idClient;
-    VbglR3GuestCtrlQueryFeatures(idClient, &g_fControlHostFeatures0);
+
+    int rc2 = VbglR3GuestCtrlQueryFeatures(idClient, &g_fControlHostFeatures0);
+    if (RT_FAILURE(rc2)) /* Querying host features is not fatal -- do not use rc here. */
+        VGSvcVerbose(1, "Querying host features failed with %Rrc\n", rc2);
 
     rc = vgsvcGstCtrlSessionReadKeyAndAccept(idClient, pSession->StartupInfo.uSessionID);
     if (RT_SUCCESS(rc))
     {
-        VGSvcVerbose(1, "Using client ID=%RU32\n", idClient);
+        VGSvcVerbose(1, "Using client ID=%RU32, g_fControlHostFeatures0=%#x\n", idClient, g_fControlHostFeatures0);
 
         /*