mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-01 09:10:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7301 from gilles-peskine-arm/msan-explicit_bzero

Browse Source 
Fix Msan failure with explicit_bzero
This commit is contained in:
Dave Rodgman 2023-03-16 14:55:18 +00:00 committed by GitHub
commit 3ac99fdf07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/platform_util.c
View File

@ -57,6 +57,15 @@
#endif #endif
#if !defined(MBEDTLS_PLATFORM_ZEROIZE_ALT) #if !defined(MBEDTLS_PLATFORM_ZEROIZE_ALT)
#undef HAVE_MEMORY_SANITIZER
#if defined(__has_feature)
#if __has_feature(memory_sanitizer)
#include <sanitizer/msan_interface.h>
#define HAVE_MEMORY_SANITIZER
#endif
#endif
/* /*
* Where possible, we try to detect the presence of a platform-provided * Where possible, we try to detect the presence of a platform-provided
* secure memset, such as explicit_bzero(), that is safe against being optimized * secure memset, such as explicit_bzero(), that is safe against being optimized
@ -100,6 +109,15 @@ void mbedtls_platform_zeroize(void *buf, size_t len)
if (len > 0) { if (len > 0) {
#if defined(MBEDTLS_PLATFORM_HAS_EXPLICIT_BZERO) #if defined(MBEDTLS_PLATFORM_HAS_EXPLICIT_BZERO)
explicit_bzero(buf, len); explicit_bzero(buf, len);
#if defined(HAVE_MEMORY_SANITIZER)
/* You'd think that Msan would recognize explicit_bzero() as
* equivalent to bzero(), but it actually doesn't on several
* platforms, including Linux (Ubuntu 20.04).
* https://github.com/google/sanitizers/issues/1507
* https://github.com/openssh/openssh-portable/commit/74433a19bb6f4cef607680fa4d1d7d81ca3826aa
*/
__msan_unpoison(buf, len);
#endif
#elif defined(__STDC_LIB_EXT1__) #elif defined(__STDC_LIB_EXT1__)
memset_s(buf, len, 0, len); memset_s(buf, len, 0, len);
#elif defined(_WIN32) #elif defined(_WIN32)