Changeset 35061 in vbox

Timestamp:

Dec 14, 2010 10:58:49 AM (14 years ago)

Author:

vboxsync

Message:

GuestControl/Main: Added timeout value for SetProcessInput to prevent host hangs when guest misbehaves.

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (7 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/GuestImpl.h (modified) (1 diff)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -346 +346 @@
                             ULONG uBytesWritten;
                             rc = pGuest->SetProcessInput(uPID, uFlags,
+                                                         5 * 1000 /* Wait 5s for getting the input data transfered. */,
                                                          ComSafeArrayAsInParam(aInputData), &uBytesWritten);
                             if (FAILED(rc))
@@ -606 +607 @@
                                     ULONG uBytesWritten;
                                     rc = pGuest->SetProcessInput(uPID, uFlags,
+                                                                 5 * 1000 /* Wait 5s for getting the input data transfered. */,
                                                                  ComSafeArrayAsInParam(aInputData), &uBytesWritten);
                                     if (FAILED(rc))
@@ -622 +624 @@
                                     Assert(cbLength >= uBytesWritten);
                                     cbLength -= uBytesWritten;
+                                }
+                                else if (RT_FAILURE(vrc))
+                                {
+                                    rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                                         Guest::tr("Error while reading setup file \"%s\" (To read: %u, Size: %u) from installation medium (%Rrc)"),
+                                                                         installerImage.c_str(), cbToRead, cbLength, vrc);
                                 }
                             }
@@ -2156 +2164 @@
 }
 
-STDMETHODIMP Guest::SetProcessInput(ULONG aPID, ULONG aFlags, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten)
+STDMETHODIMP Guest::SetProcessInput(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2217 +2225 @@
             if (FAILED(rc)) return rc;
 
+            /* Adjust timeout. */
+            if (aTimeoutMS == 0)
+                aTimeoutMS = UINT32_MAX;
+
             PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)RTMemAlloc(sizeof(CALLBACKDATAEXECINSTATUS));
             AssertReturn(pData, VBOX_E_IPRT_ERROR);
@@ -2278 +2290 @@
 
                     /* Wait until operation completed. */
-                    rc = it->second.pProgress->WaitForCompletion(UINT32_MAX /* Wait forever */);
+                    rc = it->second.pProgress->WaitForCompletion(aTimeoutMS);
                     if (FAILED(rc)) throw rc;
 
@@ -2385 +2397 @@
         if (FAILED(rc)) return rc;
 
-        /* Adjust timeout */
+        /* Adjust timeout. */
         if (aTimeoutMS == 0)
             aTimeoutMS = UINT32_MAX;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7938 +7938 @@
   <interface
     name="IGuest" extends="$unknown"
-    uuid="1039b0cc-9bc1-4c6d-8d12-864aa48aa5b9"
+    uuid="7ce7e4d8-cdaa-4d83-a0f4-510c8ee70aea"
     wsmap="managed"
     >
@@ -8327 +8327 @@
         <desc>
           Not used, must be set to zero.
+        </desc>
+      </param>
+      <param name="timeoutMS" type="unsigned long" dir="in">
+        <desc>
+          The maximum timeout value (in msec) to wait for getting the
+          data transfered to the guest. Pass 0 for an infinite timeout.
         </desc>
       </param>

trunk/src/VBox/Main/include/GuestImpl.h

@@ -99 +99 @@
                               ULONG aTimeoutMS, ULONG *aPID, IProgress **aProgress);
     STDMETHOD(GetProcessOutput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, LONG64 aSize, ComSafeArrayOut(BYTE, aData));
-    STDMETHOD(SetProcessInput)(ULONG aPID, ULONG aFlags, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten);
+    STDMETHOD(SetProcessInput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten);
     STDMETHOD(GetProcessStatus)(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ULONG *aStatus);
     STDMETHOD(CopyToGuest)(IN_BSTR aSource, IN_BSTR aDest, IN_BSTR aUserName, IN_BSTR aPassword, ULONG aFlags, IProgress **aProgress);