From 1bab27f9831c3258716d09ef9702dabcb6dca703 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Wed, 23 Nov 2022 16:51:59 +0000 Subject: [PATCH] Prevent unaligned access under ASan builds Signed-off-by: Dave Rodgman --- library/common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/common.h b/library/common.h index e502b5de13..3925a79ce5 100644 --- a/library/common.h +++ b/library/common.h @@ -73,11 +73,12 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c * * This list is incomplete. */ -#if defined(__i386__) || defined(__amd64__) || defined( __x86_64__) \ +#if (defined(__i386__) || defined(__amd64__) || defined( __x86_64__) \ || defined(__ARM_FEATURE_UNALIGNED) \ || defined(__aarch64__) \ || defined(__ARM_ARCH_8__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH_8M__) \ - || defined(__ARM_ARCH_7A__) + || defined(__ARM_ARCH_7A__)) \ + && (!(defined(__has_feature) && __has_feature(undefined_behavior_sanitizer))) #define MBEDTLS_ALLOW_UNALIGNED_ACCESS #endif