Changeset 49012 in vbox

Timestamp:

Oct 9, 2013 3:36:39 PM (11 years ago)

Author:

vboxsync

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

89754

Message:

OS X host: leds sync: fixed SEGFAULT when cached device was detached physically.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -22 +22 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_GUI
-//#define VBOX_WITH_KBD_LEDS_SYNC
+#define VBOX_WITH_KBD_LEDS_SYNC
 
 #include "DarwinKeyboard.h"
@@ -292 +292 @@
 #ifdef VBOX_WITH_KBD_LEDS_SYNC
 /* HID LEDs synchronization data: LED states. */
-typedef struct VBoxHidLeds_t {
+typedef struct VBoxKbdState_t {
     bool             fNumLockOn;
     bool             fCapsLockOn;
     bool             fScrollLockOn;
-} VBoxHidLeds_t;
+    bool             fAttached;
+} VBoxKbdState_t;
 
 /* HID LEDs synchronization data: IOKit specific data. */
@@ -302 +303 @@
     IOHIDManagerRef     hidManagerRef;
     IOHIDDeviceRef     *hidDevicesCollection;
-    VBoxHidLeds_t      *hidLedsCollection;
+    VBoxKbdState_t      *hidLedsCollection;
     CFIndex             cDevices;
     CFMachPortRef       pTapRef;
@@ -309 +310 @@
 
 /* A *sync* between IOKit and Carbon callbacks. */
-static VBoxHidLeds_t *g_LastTouchedState;
+static VBoxKbdState_t *g_LastTouchedState;
 #endif // !VBOX_WITH_KBD_LEDS_SYNC
 
@@ -1379 +1380 @@
 }
 
+static void darwinHidRemovalCallback(void *pData, IOReturn unused, void *unused1)
+{
+    (void)unused;
+    (void)unused1;
+
+    VBoxKbdState_t *pState = (VBoxKbdState_t *)pData;
+
+    if (pState)
+    {
+        pState->fAttached = false;
+    }
+}
+
 /** IOKit key press callback. Triggered before Carbon callback. */
 static void darwinHidInputCallback(void *pData, IOReturn unused, void *unused1, IOHIDValueRef valueRef)
@@ -1395 +1409 @@
                 {
                     Log2(("A modifier key has been pressed\n"));
-                    g_LastTouchedState = (VBoxHidLeds_t *)pData;
+                    g_LastTouchedState = (VBoxKbdState_t *)pData;
                 }
 
@@ -1557 +1571 @@
                         if (hidsState->hidDevicesCollection)
                         {
-                            hidsState->hidLedsCollection = (VBoxHidLeds_t *)malloc((size_t)hidsState->cDevices * sizeof(VBoxHidLeds_t));
+                            hidsState->hidLedsCollection = (VBoxKbdState_t *)malloc((size_t)hidsState->cDevices * sizeof(VBoxKbdState_t));
                             if (hidsState->hidLedsCollection)
                             {
@@ -1585 +1599 @@
                                             }
 
+                                            /* Mark a device as currently attached. If device will be removed (physically)
+                                             * before current state is applied (by DarwinHidDevicesApplyAndReleaseLedsState()), we mark
+                                             * it as detached one in a removal callback. We cannot access device which was detached
+                                             * because IOKit released the resources and this will trigger a SEGFAULT. */
+                                            hidsState->hidLedsCollection[i].fAttached = true;
+
+                                            /* Register per-device removal callback */
+                                            IOHIDDeviceRegisterRemovalCallback(hidsState->hidDevicesCollection[i], darwinHidRemovalCallback, (void *)&hidsState->hidLedsCollection[i]);
+
                                             /* Register per-device input callback */
                                             IOHIDDeviceRegisterInputValueCallback(hidsState->hidDevicesCollection[i], darwinHidInputCallback, (void *)&hidsState->hidLedsCollection[i]);
@@ -1657 +1680 @@
             {
                 /* Cycle through supported devices only. */
-                if (IOHIDDeviceConformsTo(hidsState->hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)
+                if (hidsState->hidLedsCollection[i].fAttached
+                 && IOHIDDeviceConformsTo(hidsState->hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)
                  && darwinHidDeviceSupported(hidsState->hidDevicesCollection[i]))
                 {