Changeset 79369 in vbox for trunk/src/VBox

Timestamp:

Jun 26, 2019 6:00:52 PM (6 years ago)

Author:

vboxsync

Message:

Main/GuestProcessImpl.cpp: Check flags passed to write* and WaitFor*. bugref:9320

File:

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

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

@@ -1866 +1866 @@
     LogFlowThisFuncEnter();
 
+    /* Validate flags: */
+    static ULONG const s_fValidFlags = ProcessWaitForFlag_None   | ProcessWaitForFlag_Start  | ProcessWaitForFlag_Terminate
+                                     | ProcessWaitForFlag_StdIn  | ProcessWaitForFlag_StdOut | ProcessWaitForFlag_StdErr;
+    if (aWaitFor & ~s_fValidFlags)
+        return setErrorBoth(E_INVALIDARG, VERR_INVALID_FLAGS, tr("Flags value %#x, invalid: %#x"),
+                            aWaitFor, aWaitFor & ~s_fValidFlags);
+
     /*
      * Note: Do not hold any locks here while waiting!
@@ -1914 +1921 @@
                             ULONG aTimeoutMS, ULONG *aWritten)
 {
+    static ULONG const s_fValidFlags = ProcessInputFlag_None | ProcessInputFlag_EndOfFile;
+    if (aFlags & ~s_fValidFlags)
+        return setErrorBoth(E_INVALIDARG, VERR_INVALID_FLAGS, tr("Flags value %#x, invalid: %#x"),
+                            aFlags, aFlags & ~s_fValidFlags);
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -1922 +1934 @@
 
     uint32_t cbWritten;
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    uint32_t cbData = (uint32_t)aData.size();
-    void *pvData = cbData > 0? (void *)&aData.front(): NULL;
+    int      rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    uint32_t cbData  = (uint32_t)aData.size();
+    void    *pvData  = cbData > 0 ? (void *)&aData.front() : NULL;
     int vrc = i_writeData(aHandle, aFlags, pvData, cbData, aTimeoutMS, &cbWritten, &rcGuest);
     if (RT_FAILURE(vrc))