Changeset 106272 in vbox

Timestamp:

Oct 10, 2024 8:01:24 AM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165067

Message:

DrvNATlibslirp: Initialize cChangedFDs since RTWinPoll only sets it when returning VINF_SUCCESS and the code doesn't check the return code before using the value and ending up with an uninitialized stack value instead. Don't release log VERR_TIMEOUT returns from RTWSAPoll so the release log doesn't get flooded. bugref:10268

File:

• trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp

@@ -781 +781 @@
 
 #else /* RT_OS_WINDOWS */
-        uint32_t uTimeout = DRVNAT_DEFAULT_TIMEOUT;
+        uint32_t msTimeout = DRVNAT_DEFAULT_TIMEOUT;
         pThis->pNATState->nsock = 0;
-        slirp_pollfds_fill(pThis->pNATState->pSlirp, &uTimeout, drvNAT_AddPollCb /* SlirpAddPollCb */, pThis /* opaque */);
-        drvNAT_UpdateTimeout(&uTimeout, pThis);
-
-        int cChangedFDs;
-        int error = RTWinPoll(pThis->pNATState->polls, pThis->pNATState->nsock, uTimeout /* timeout */, &cChangedFDs, pThis->hWakeupEvent);
-
-        if (error != 0)
-        {
-            LogRel(("NAT: WSAPoll returned %d (error %d)\n", cChangedFDs, error));
+        slirp_pollfds_fill(pThis->pNATState->pSlirp, &msTimeout, drvNAT_AddPollCb /* SlirpAddPollCb */, pThis /* opaque */);
+        drvNAT_UpdateTimeout(&msTimeout, pThis);
+
+        int cChangedFDs = 0;
+        int vrc = RTWinPoll(pThis->pNATState->polls, pThis->pNATState->nsock, msTimeout, &cChangedFDs, pThis->hWakeupEvent);
+        if (vrc != VINF_SUCCESS)
+        {
+            if (vrc != VERR_TIMEOUT)
+                LogRel(("NAT: WSAPoll returned vrc=%Rrc (cChangedFDs=%d)\n", vrc, cChangedFDs));
             Log4(("NAT: NSOCK = %d\n", pThis->pNATState->nsock));
         }