Changeset 103281 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 8, 2024 2:37:11 PM (12 months ago)

Author:

vboxsync

Message:

Dev/PC/DevPit-i8254: Don't leak fd if speaker emulation isn't possible (found by Parfait, improved fix). bugref:3409

File:

• trunk/src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -1391 +1391 @@
         /** @todo r=klaus move this to a (system-specific) driver */
 #ifdef RT_OS_LINUX
+        /** @todo r=andy Use #defines / enums(?) for all those uPassthroughSpeaker below. */
         int fd = -1;
-        if ((uPassthroughSpeaker == 1 || uPassthroughSpeaker == 100) && fd == -1)
+        if (uPassthroughSpeaker == 1 || uPassthroughSpeaker == 100)
             fd = pitR3TryDeviceOpenSanitizeIoctl("/dev/input/by-path/platform-pcspkr-event-spkr", O_WRONLY);
-        if ((uPassthroughSpeaker == 2 || uPassthroughSpeaker == 100) && fd == -1)
+
+        if (fd == -1 && (uPassthroughSpeaker == 2 || uPassthroughSpeaker == 100))
             fd = pitR3TryDeviceOpenSanitizeIoctl("/dev/tty", O_WRONLY);
-        if ((uPassthroughSpeaker == 3 || uPassthroughSpeaker == 100) && fd == -1)
+
+        if (fd == -1 && (uPassthroughSpeaker == 3 || uPassthroughSpeaker == 100))
         {
             fd = pitR3TryDeviceOpenSanitizeIoctl("/dev/tty0", O_WRONLY);
@@ -1402 +1405 @@
                 fd = pitR3TryDeviceOpenSanitizeIoctl("/dev/vc/0", O_WRONLY);
         }
-        if ((uPassthroughSpeaker == 9 || uPassthroughSpeaker == 100) && pszPassthroughSpeakerDevice && fd == -1)
+
+        if (fd == -1 && (uPassthroughSpeaker == 9 || uPassthroughSpeaker == 100) && pszPassthroughSpeakerDevice)
             fd = pitR3TryDeviceOpenSanitizeIoctl(pszPassthroughSpeakerDevice, O_WRONLY);
-        if (pThisCC->enmSpeakerEmu == PIT_SPEAKER_EMU_NONE && fd != -1)
+
+        if (fd != -1)
         {
-            pThisCC->hHostSpeaker = fd;
             if (ioctl(fd, EVIOCGSND(0)) != -1)
             {
@@ -1417 +1421 @@
                 LogRel(("PIT: speaker: emulation mode console\n"));
             }
+            pThisCC->hHostSpeaker = fd;
         }
-        if ((uPassthroughSpeaker == 70 || uPassthroughSpeaker == 100) && fd == -1)
-            fd = pitR3TryDeviceOpen("/dev/tty", O_WRONLY);
-        if ((uPassthroughSpeaker == 79 || uPassthroughSpeaker == 100) && pszPassthroughSpeakerDevice && fd == -1)
-            fd = pitR3TryDeviceOpen(pszPassthroughSpeakerDevice, O_WRONLY);
-        if (pThisCC->enmSpeakerEmu == PIT_SPEAKER_EMU_NONE && fd != -1)
+        else
         {
-            pThisCC->hHostSpeaker = fd;
-            pThisCC->enmSpeakerEmu = PIT_SPEAKER_EMU_TTY;
-            LogRel(("PIT: speaker: emulation mode tty\n"));
-        }
-        if (pThisCC->enmSpeakerEmu == PIT_SPEAKER_EMU_NONE)
-        {
+            if (uPassthroughSpeaker == 70 || uPassthroughSpeaker == 100)
+                fd = pitR3TryDeviceOpen("/dev/tty", O_WRONLY);
+            if (fd == -1 && (uPassthroughSpeaker == 79 || uPassthroughSpeaker == 100) && pszPassthroughSpeakerDevice)
+                fd = pitR3TryDeviceOpen(pszPassthroughSpeakerDevice, O_WRONLY);
             if (fd != -1)
             {
-                close(fd);
-                fd = -1;
+                pThisCC->enmSpeakerEmu = PIT_SPEAKER_EMU_TTY;
+                pThisCC->hHostSpeaker  = fd;
+                LogRel(("PIT: speaker: emulation mode tty\n"));
             }
-            LogRel(("PIT: speaker: no emulation possible\n"));
+            else
+                LogRel(("PIT: speaker: no emulation possible\n"));
         }
-#else
+#else  /* !RT_OS_LINUX */
         LogRel(("PIT: speaker: emulation deactivated\n"));
-#endif
+#endif /* !RT_OS_LINUX */
         if (pszPassthroughSpeakerDevice)
         {