Skip to content

20260608-atomic-fixes #10640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgarske merged 1 commit into from
Jun 9, 2026
+28 −14
Merged

20260608-atomic-fixes #10640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions wolfcrypt/src/wc_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ int wolfCrypt_Cleanup(void)
ret = wc_local_InitDown(&wolfcrypt_init_state);
if (ret < 0) {
if (ret == WC_NO_ERR_TRACE(ALREADY_E))
WOLFSSL_MSG("wolfCrypt_Cleanup() called with initRefCount <= 0.");
WOLFSSL_MSG("wolfCrypt_Cleanup() called during or after prior final cleanup.");
else if (ret == WC_NO_ERR_TRACE(BAD_STATE_E))
WOLFSSL_MSG("wolfCrypt_Cleanup() failed: bad internal state.");
#ifdef WC_INIT_ERROR_WHEN_CONTENDED
Expand Down Expand Up @@ -1766,14 +1766,16 @@ WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_FetchSub(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_AddFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = atomic_fetch_add_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_INT_ARG ret =
atomic_fetch_add_explicit(c, i, memory_order_relaxed);
return ret + i;
}

WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_SubFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_INT_ARG ret =
atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
return ret - i;
}

Expand Down Expand Up @@ -1812,14 +1814,16 @@ WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint_FetchSub(wolfSSL_Atomic_Uint* c,
WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint_AddFetch(wolfSSL_Atomic_Uint* c,
WC_ATOMIC_UINT_ARG i)
{
unsigned int ret = atomic_fetch_add_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_UINT_ARG ret =
atomic_fetch_add_explicit(c, i, memory_order_relaxed);
return ret + i;
}

WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint_SubFetch(wolfSSL_Atomic_Uint* c,
WC_ATOMIC_UINT_ARG i)
{
unsigned int ret = atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_UINT_ARG ret =
atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
return ret - i;
}

Expand Down Expand Up @@ -1987,22 +1991,24 @@ WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_FetchSub(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_AddFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = (int)_InterlockedExchangeAdd(c, (long)i);
WC_ATOMIC_INT_ARG ret =
(WC_ATOMIC_INT_ARG)_InterlockedExchangeAdd(c, (long)i);
return ret + i;
}

WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_SubFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = (int)_InterlockedExchangeAdd(c, (long)-i);
WC_ATOMIC_INT_ARG ret =
(WC_ATOMIC_INT_ARG)_InterlockedExchangeAdd(c, (long)-i);
return ret - i;
}

WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_Exchange(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG new_i)
{
long actual_i = InterlockedExchange(c, (long)new_i);
return (int)actual_i;
return (WC_ATOMIC_INT_ARG)actual_i;
}

int wolfSSL_Atomic_Int_CompareExchange(wolfSSL_Atomic_Int* c,
Expand All @@ -2015,7 +2021,7 @@ int wolfSSL_Atomic_Int_CompareExchange(wolfSSL_Atomic_Int* c,
return 1;
}
else {
*expected_i = (int)actual_i;
*expected_i = (WC_ATOMIC_INT_ARG)actual_i;
return 0;
}
}
Expand Down Expand Up @@ -2060,7 +2066,7 @@ int wolfSSL_Atomic_Uint_CompareExchange(
return 1;
}
else {
*expected_i = (unsigned int)actual_i;
*expected_i = (WC_ATOMIC_UINT_ARG)actual_i;
return 0;
}
}
Expand Down
16 changes: 12 additions & 4 deletions wolfssl/wolfcrypt/wc_port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
typedef WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint;
#define WOLFSSL_ATOMIC_INITIALIZER(x) (x)
#define WOLFSSL_ATOMIC_LOAD(x) (x)
#define WOLFSSL_ATOMIC_STORE(x, val) (x) = (val)
#define WOLFSSL_ATOMIC_STORE(x, val) (void)((x) = (val))
#define WOLFSSL_ATOMIC_OPS
#elif defined(WOLFSSL_BSDKM)
/* Note: <stdatomic.h> can be safely included in both linux kernel and
Expand Down Expand Up @@ -567,7 +567,8 @@
#define WOLFSSL_ATOMIC_STORE(x, val) __atomic_store_n(&(x), \
val, __ATOMIC_RELEASE)
#define WOLFSSL_ATOMIC_OPS
#elif defined(_MSC_VER) && !defined(WOLFSSL_NOT_WINDOWS_API)
#elif defined(_MSC_VER) && defined(USE_WINDOWS_API) && \
!defined(WOLFSSL_NOT_WINDOWS_API)
/* Use MSVC compiler intrinsics for atomic ops */
#ifdef _WIN32_WCE
#include <armintr.h>
Expand All @@ -577,8 +578,15 @@
typedef volatile long wolfSSL_Atomic_Int;
typedef volatile unsigned long wolfSSL_Atomic_Uint;
#define WOLFSSL_ATOMIC_INITIALIZER(x) (x)
#define WOLFSSL_ATOMIC_LOAD(x) (x)
#define WOLFSSL_ATOMIC_STORE(x, val) (x) = (val)
/* Acquire-ordered load via idempotent RMW: OR-with-0 leaves the value
* unchanged but provides atomicity + acquire ordering. On cl.exe this
* is a locked RMW; LLVM (clang-cl) may lower it to a plain acquire
* load.
*/
#define WOLFSSL_ATOMIC_LOAD(x) \
InterlockedOrAcquire((volatile long *)&(x), 0)
#define WOLFSSL_ATOMIC_STORE(x, val) \
(void)InterlockedExchange((volatile long *)&(x), (long)(val))
#define WOLFSSL_ATOMIC_OPS
#endif

Expand Down
Loading