[Darwin] MTRDeviceController_XPC _updateRegistrationInfo double lock …

…fix (project-chip#37664) * [Darwin] MTRDeviceController_XPC _updateRegistrationInfo double lock fix * Make sure device map is accessed safely with lock
mkardous-silabs · Feb 19, 2025 · 0551d0a · 0551d0a
1 parent 1bd8e40
commit 0551d0a
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_XPC.mm b/src/darwin/Framework/CHIP/MTRDeviceController_XPC.mm
@@ -72,24 +72,28 @@ @implementation MTRDeviceController_XPC
 
 - (void)_updateRegistrationInfo
 {
-    NSMutableDictionary * registrationInfo = [NSMutableDictionary dictionary];
+    dispatch_async(self.workQueue, ^{
+        std::lock_guard lock(*self.deviceMapLock);
 
-    NSMutableDictionary * controllerContext = [NSMutableDictionary dictionary];
-    NSMutableArray * nodeIDs = [NSMutableArray array];
+        NSMutableDictionary * registrationInfo = [NSMutableDictionary dictionary];
 
-    for (NSNumber * nodeID in [self.nodeIDToDeviceMap keyEnumerator]) {
-        MTRDevice * device = [self _deviceForNodeID:nodeID createIfNeeded:NO];
-        if ([device delegateExists]) {
-            NSMutableDictionary * nodeDictionary = [NSMutableDictionary dictionary];
-            MTR_REQUIRED_ATTRIBUTE(MTRDeviceControllerRegistrationNodeIDKey, nodeID, nodeDictionary)
+        NSMutableDictionary * controllerContext = [NSMutableDictionary dictionary];
+        NSMutableArray * nodeIDs = [NSMutableArray array];
 
-            [nodeIDs addObject:nodeDictionary];
+        for (NSNumber * nodeID in [self.nodeIDToDeviceMap keyEnumerator]) {
+            MTRDevice * device = self.nodeIDToDeviceMap[nodeID];
+            if ([device delegateExists]) {
+                NSMutableDictionary * nodeDictionary = [NSMutableDictionary dictionary];
+                MTR_REQUIRED_ATTRIBUTE(MTRDeviceControllerRegistrationNodeIDKey, nodeID, nodeDictionary)
+
+                [nodeIDs addObject:nodeDictionary];
+            }
         }
-    }
-    MTR_REQUIRED_ATTRIBUTE(MTRDeviceControllerRegistrationNodeIDsKey, nodeIDs, registrationInfo)
-    MTR_REQUIRED_ATTRIBUTE(MTRDeviceControllerRegistrationControllerContextKey, controllerContext, registrationInfo)
+        MTR_REQUIRED_ATTRIBUTE(MTRDeviceControllerRegistrationNodeIDsKey, nodeIDs, registrationInfo)
+        MTR_REQUIRED_ATTRIBUTE(MTRDeviceControllerRegistrationControllerContextKey, controllerContext, registrationInfo)
 
-    [self updateControllerConfiguration:registrationInfo];
+        [self updateControllerConfiguration:registrationInfo];
+    });
 }
 
 - (void)_registerNodeID:(NSNumber *)nodeID