diff options
| author | Eugene Syromiatnikov <[email protected]> | 2026-10-12 11:54:53 +0200 |
|---|---|---|
| committer | Eugene Syromiatnikov <[email protected]> | 2026-10-12 11:54:53 +0200 |
| commit | b3cd968c1d40d4bdb77c8ab91852117ec02138ed (patch) | |
| tree | 48dc03fb1b73e18d342a2e904640090d4b89a8e7 | |
| parent | Fix set but unsued variable in lib/opt.c (diff) | |
| download | openssl-b3cd968c1d40d4bdb77c8ab91852117ec02138ed.tar.gz openssl-b3cd968c1d40d4bdb77c8ab91852117ec02138ed.zip | |
Revert "crypto/mem.c: suppress benign TSan race in allocator initialization"
This reverts commit 61a8ca5b7caa "crypto/mem.c: suppress benign TSan race
in allocator initialization": TSAN_BENIGN() definition has been changed
in commit 79cd5c9bdc9a "remove read lock from method store cache
lookup", so backporting the commit as-is lead to a build error when
configured with -fthread-sanitizer; just back off the change rather
than fix the usage or backport the updated TSAN_BENIGN() definition,
as there is no current need to have this instrumentation in openssl-4.0
branch.
Signed-off-by: Eugene Syromiatnikov <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Merge-date: Mon Oct 12 16:36:17 2026
Merged-from: https://github.com/openssl/openssl/pull/33199
| -rw-r--r-- | crypto/mem.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index df86a5e695a..10252e4ae7e 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -8,7 +8,6 @@ */ #include "internal/e_os.h" -#include "internal/threads_common.h" #include "internal/cryptlib.h" #include "internal/mem_alloc_utils.h" #include "crypto/cryptlib.h" @@ -204,8 +203,6 @@ void *CRYPTO_malloc(size_t num, const char *file, int line) FAILTEST(); if (allow_customize) { - TSAN_BENIGN(&allow_customize, - "allow_customize is intentionally racy"); /* * Disallow customization after the first allocation. We only set this * if necessary to avoid a store to the same cache line on every |