Merge branch 'master' into spec-updates

project-chip · Jan 28, 2025 · a5ba8ad · a5ba8ad
2 parents 99fe4cc + a3561e1
commit a5ba8ad
Show file tree

Hide file tree

Showing 26 changed files with 1,690 additions and 1,061 deletions.
diff --git a/.github/workflows/restyled.yml b/.github/workflows/restyled.yml
@@ -16,7 +16,9 @@ jobs:
 
       - uses: restyled-io/actions/setup@v4
         with:
-          # Pin the Restyler version to v0.6.0.2
+          # TODO: Pinned to v0.6.0.2 because the latest release does not have a pre-built
+          # 'restyler-linux' asset. This broke our workflow as we rely on the pre-built binary.
+          # Remove this pin once a new release with the 'restyler-linux' asset is available.          
           tag: 'v0.6.0.2'
 
       - id: restyler

diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -28,9 +28,9 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 
 // TODO: We shouldn't need any platform specific includes in this file
-#ifdef WF200_WIFI
-#include <platform/silabs/wifi/wf200/ncp/sl_wfx_task.h>
-#endif // WF200_WIFI
+#if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
+#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
+#endif // (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
 #endif // SL_WIFI
 
 #if PW_RPC_ENABLED
@@ -45,15 +45,6 @@
 #include "MemMonitoring.h"
 #endif
 
-// TODO: We shouldn't need any platform specific includes in this file
-#if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
-#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
-#endif // (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 )
-
-#if ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
-#include <platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h>
-#endif // ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
-
 #include <crypto/CHIPCryptoPAL.h>
 // If building with the EFR32-provided crypto backend, we can use the
 // opaque keystore
@@ -317,18 +308,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 #ifdef SL_WIFI
 CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
 {
-    // TODO: Platform specific init should not be required here
-#ifdef WF200_WIFI
-    // Start wfx bus communication task.
-    wfx_bus_start();
-#endif // WF200_WIFI
-
-    // TODO: Platform specific init should not be required here
-#if ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
-    VerifyOrReturnError(InitSiWxWifi() == SL_STATUS_OK, CHIP_ERROR_INTERNAL);
-#endif //((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD))
-
-    return CHIP_NO_ERROR;
+    return InitWiFiStack();
 }
 #endif // SL_WIFI
 

diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
@@ -58,28 +58,6 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "gcr.io/cloud-builders/docker"
-      args:
-          [
-              "/workspace/examples/chef/create_docker.py",
-              "--commit_sha",
-              "$COMMIT_SHA",
-              "--short_sha",
-              "$SHORT_SHA",
-              "--revision_id",
-              "$REVISION_ID",
-              "--build_id",
-              "$BUILD_ID",
-              "--image_name",
-              "$_DOCKER_IMAGE_NAME",
-              "--tar_path",
-              "/workspace/artifacts",
-          ]
-      id: DockerAll
-      entrypoint: python3
-      waitFor:
-          - CompileNoip
-
 logsBucket: matter-build-automation-build-logs
 
 # Global timeout for all steps

diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/start-sysroot-vm.sh b/integrations/docker/images/stage-1/chip-build-crosscompile/start-sysroot-vm.sh
@@ -117,6 +117,7 @@ packages:
   - libdbus-1-dev
   - libgirepository1.0-dev
   - libglib2.0-dev
+  - libpcsclite-dev
   - libreadline-dev
   - libsdl2-dev
   - libssl-dev

diff --git a/src/BUILD.gn b/src/BUILD.gn
@@ -66,6 +66,7 @@ if (chip_build_tests) {
       "${chip_root}/src/protocols/interaction_model/tests",
       "${chip_root}/src/protocols/secure_channel/tests",
       "${chip_root}/src/protocols/user_directed_commissioning/tests",
+      "${chip_root}/src/lib/support/verhoeff/tests",
       "${chip_root}/src/system/tests",
       "${chip_root}/src/transport/retransmit/tests",
       "${chip_root}/src/transport/tests",

diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
@@ -1967,12 +1967,20 @@ void InteractionModelEngine::OnFabricRemoved(const FabricTable & fabricTable, Fa
     });
 
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
-    for (auto * readClient = mpActiveReadClientList; readClient != nullptr; readClient = readClient->GetNextClient())
+    for (auto * readClient = mpActiveReadClientList; readClient != nullptr;)
     {
+        // ReadClient::Close may delete the read client so that readClient->GetNextClient() will be use-after-free.
+        // We need save readClient as nextReadClient before closing.
         if (readClient->GetFabricIndex() == fabricIndex)
         {
             ChipLogProgress(InteractionModel, "Fabric removed, deleting obsolete read client with FabricIndex: %u", fabricIndex);
+            auto * nextReadClient = readClient->GetNextClient();
             readClient->Close(CHIP_ERROR_IM_FABRIC_DELETED, false);
+            readClient = nextReadClient;
+        }
+        else
+        {
+            readClient = readClient->GetNextClient();
         }
     }
 #endif // CHIP_CONFIG_ENABLE_READ_CLIENT

diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
@@ -324,7 +324,7 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
     /**
      * @brief Function decrements the number of subscriptions to resume counter - mNumOfSubscriptionsToResume.
      *        This should be called after we have completed a re-subscribe attempt on a persisted subscription wether the attempt
-     *        was succesful or not.
+     *        was successful or not.
      */
     void DecrementNumSubscriptionsToResume();
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
@@ -714,7 +714,7 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
 #endif // CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
 
-    FabricTable * mpFabricTable;
+    FabricTable * mpFabricTable = nullptr;
 
     CASESessionManager * mpCASESessionMgr = nullptr;