From c34e8b9be0ad88c0d45398ad748a9ee24780e875 Mon Sep 17 00:00:00 2001
From: annihilatorq <143023834+annihilatorq@users.noreply.github.com>
Date: Fri, 11 Sep 2026 23:32:04 +0200
Subject: [PATCH] Fix data race on error queue state in wc_LoggingInit

---
 wolfcrypt/src/logging.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wolfcrypt/src/logging.c b/wolfcrypt/src/logging.c
index 736adbebdb6..9d990054cd5 100644
--- a/wolfcrypt/src/logging.c
+++ b/wolfcrypt/src/logging.c
@@ -1107,10 +1107,18 @@ int wc_LoggingInit(void)
         return BAD_MUTEX_E;
     }
 #endif
+    if (ERRQ_LOCK() != 0) {
+        WOLFSSL_MSG("Lock debug mutex failed");
+#ifndef WOLFSSL_MUTEX_INITIALIZER
+        (void)ERRQ_MUTEX_FREE();
+#endif
+        return BAD_MUTEX_E;
+    }
     wc_errors_count = 0;
     wc_errors          = NULL;
     wc_current_node    = NULL;
     wc_last_node       = NULL;
+    ERRQ_UNLOCK();
     return 0;
 }