[Zephyr] Fix potential data race on multicast configuration (#20722)

OpenThread functions for joining or leaving multicast groups would be called without holding the Thread stack lock. Signed-off-by: Damian Krolik <[email protected]>
project-chip · Aug 7, 2023 · 77aa79c · 77aa79c
1 parent c86a5b2
commit 77aa79c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/platform/Zephyr/ThreadStackManagerImpl.cpp b/src/platform/Zephyr/ThreadStackManagerImpl.cpp
@@ -48,13 +48,21 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
 
     UDPEndPointImplSockets::SetJoinMulticastGroupHandler([](InterfaceId, const IPAddress & address) {
         const otIp6Address otAddress = ToOpenThreadIP6Address(address);
-        const auto otError           = otIp6SubscribeMulticastAddress(openthread_get_default_instance(), &otAddress);
+
+        ThreadStackMgr().LockThreadStack();
+        const auto otError = otIp6SubscribeMulticastAddress(openthread_get_default_instance(), &otAddress);
+        ThreadStackMgr().UnlockThreadStack();
+
         return MapOpenThreadError(otError);
     });
 
     UDPEndPointImplSockets::SetLeaveMulticastGroupHandler([](InterfaceId, const IPAddress & address) {
         const otIp6Address otAddress = ToOpenThreadIP6Address(address);
-        const auto otError           = otIp6UnsubscribeMulticastAddress(openthread_get_default_instance(), &otAddress);
+
+        ThreadStackMgr().LockThreadStack();
+        const auto otError = otIp6UnsubscribeMulticastAddress(openthread_get_default_instance(), &otAddress);
+        ThreadStackMgr().UnlockThreadStack();
+
         return MapOpenThreadError(otError);
     });