Changeset 84243 in vbox for trunk/src/VBox/Main

Timestamp:

May 11, 2020 9:59:59 AM (5 years ago)

Author:

vboxsync

Message:

Guest Control: Implemented support for long(er) command lines. bugref:9320

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -1058 +1058 @@
     const GuestCredentials &sessionCreds = pSession->i_getCredentials();
 
-
     /* Prepare arguments. */
     size_t cArgs = mData.mProcess.mArguments.size();
@@ -1064 +1063 @@
         return VERR_BUFFER_OVERFLOW;
 
+    Guest *pGuest = mSession->i_getParent();
+    AssertPtr(pGuest);
+
+    const uint64_t fGuestControlFeatures0 = pGuest->i_getGuestControlFeatures0();
+
+    /* If the guest does not support dynamic sizes, make sure that we check limits here. */
+    if (   !(fGuestControlFeatures0 & VBOX_GUESTCTRL_GF_0_PROCESS_DYNAMIC_SIZES)
+        &&  mData.mProcess.mExecutable.length() + 1 /* Include termination */ > GUESTPROCESS_DEFAULT_CMD_LEN)
+        return VERR_BUFFER_OVERFLOW;
+
+    size_t cbArgs = 0;
     char *pszArgs = NULL;
     int vrc = VINF_SUCCESS;
@@ -1077 +1087 @@
         }
         papszArgv[cArgs] = NULL;
-
-        Guest *pGuest = mSession->i_getParent();
-        AssertPtr(pGuest);
-
-        const uint64_t fGuestControlFeatures0 = pGuest->i_getGuestControlFeatures0();
 
         /* If the Guest Additions don't support using argv[0] correctly (< 6.1.x), don't supply it. */
@@ -1093 +1098 @@
             return vrc;
 
-        /* Note! No returns after this. */
-    }
-
-    /* Calculate arguments size (in bytes). */
-    size_t cbArgs = pszArgs ? strlen(pszArgs) + 1 : 0; /* Include terminating zero. */
+        /* Note! No direct returns after this. */
+
+        /* Calculate arguments size (in bytes). */
+        AssertPtr(pszArgs);
+        cbArgs = strlen(pszArgs) + 1; /* Include terminating zero. */
+
+        /* If the guest does not support dynamic sizes, make sure that we check limits here. */
+        if (   !(fGuestControlFeatures0 & VBOX_GUESTCTRL_GF_0_PROCESS_DYNAMIC_SIZES)
+            && cbArgs > GUESTPROCESS_DEFAULT_ARGS_LEN)
+        {
+            vrc = VERR_BUFFER_OVERFLOW;
+        }
+    }
 
     /* Prepare environment.  The guest service dislikes the empty string at the end, so drop it. */
     size_t  cbEnvBlock;
     char   *pszzEnvBlock;
-    vrc = mData.mProcess.mEnvironmentChanges.queryUtf8Block(&pszzEnvBlock, &cbEnvBlock);
+    if (RT_SUCCESS(vrc))
+        vrc = mData.mProcess.mEnvironmentChanges.queryUtf8Block(&pszzEnvBlock, &cbEnvBlock);
+    if (RT_SUCCESS(vrc))
+    {
+        /* If the guest does not support dynamic sizes, make sure that we check limits here. */
+        if (   !(fGuestControlFeatures0 & VBOX_GUESTCTRL_GF_0_PROCESS_DYNAMIC_SIZES)
+            && cbEnvBlock > GUESTPROCESS_DEFAULT_ENV_LEN)
+            vrc = VERR_BUFFER_OVERFLOW;
+    }
+
     if (RT_SUCCESS(vrc))
     {