|
 |
ff3df4 |
From af38074874c605f9e598ae3f7e5d4befa3fe92bb Mon Sep 17 00:00:00 2001
|
|
|
ff3df4 |
From: serge-sans-paille <sguelton@redhat.com>
|
|
|
ff3df4 |
Date: Thu, 28 May 2020 17:50:31 +0200
|
|
|
ff3df4 |
Subject: [PATCH] Fix strict aliasing warning in msan.cpp
|
|
|
ff3df4 |
|
|
|
ff3df4 |
Use internal_memcpy instead.
|
|
|
ff3df4 |
|
|
|
ff3df4 |
Differential Revision: https://reviews.llvm.org/D80732
|
|
|
ff3df4 |
---
|
|
|
ff3df4 |
compiler-rt/lib/msan/msan.cpp | 21 ++++++++++++++-------
|
|
|
ff3df4 |
1 file changed, 14 insertions(+), 7 deletions(-)
|
|
|
ff3df4 |
|
|
|
ff3df4 |
diff --git compiler-rt.orig/lib/msan/msan.cpp compiler-rt/lib/msan/msan.cpp
|
|
|
ff3df4 |
index 7095ee1bf20..8c789901adc 100644
|
|
|
ff3df4 |
--- compiler-rt.orig/lib/msan/msan.cpp
|
|
|
ff3df4 |
+++ compiler-rt/lib/msan/msan.cpp
|
|
|
ff3df4 |
@@ -617,34 +617,41 @@ u32 __msan_get_umr_origin() {
|
|
|
ff3df4 |
}
|
|
|
ff3df4 |
|
|
|
ff3df4 |
u16 __sanitizer_unaligned_load16(const uu16 *p) {
|
|
|
ff3df4 |
- *(uu16 *)&__msan_retval_tls[0] = *(uu16 *)MEM_TO_SHADOW((uptr)p);
|
|
|
ff3df4 |
+ internal_memcpy(&__msan_retval_tls[0], (void *)MEM_TO_SHADOW((uptr)p),
|
|
|
ff3df4 |
+ sizeof(uu16));
|
|
|
ff3df4 |
if (__msan_get_track_origins())
|
|
|
ff3df4 |
__msan_retval_origin_tls = GetOriginIfPoisoned((uptr)p, sizeof(*p));
|
|
|
ff3df4 |
return *p;
|
|
|
ff3df4 |
}
|
|
|
ff3df4 |
u32 __sanitizer_unaligned_load32(const uu32 *p) {
|
|
|
ff3df4 |
- *(uu32 *)&__msan_retval_tls[0] = *(uu32 *)MEM_TO_SHADOW((uptr)p);
|
|
|
ff3df4 |
+ internal_memcpy(&__msan_retval_tls[0], (void *)MEM_TO_SHADOW((uptr)p),
|
|
|
ff3df4 |
+ sizeof(uu32));
|
|
|
ff3df4 |
if (__msan_get_track_origins())
|
|
|
ff3df4 |
__msan_retval_origin_tls = GetOriginIfPoisoned((uptr)p, sizeof(*p));
|
|
|
ff3df4 |
return *p;
|
|
|
ff3df4 |
}
|
|
|
ff3df4 |
u64 __sanitizer_unaligned_load64(const uu64 *p) {
|
|
|
ff3df4 |
- __msan_retval_tls[0] = *(uu64 *)MEM_TO_SHADOW((uptr)p);
|
|
|
ff3df4 |
+ internal_memcpy(&__msan_retval_tls[0], (void *)MEM_TO_SHADOW((uptr)p),
|
|
|
ff3df4 |
+ sizeof(uu64));
|
|
|
ff3df4 |
if (__msan_get_track_origins())
|
|
|
ff3df4 |
__msan_retval_origin_tls = GetOriginIfPoisoned((uptr)p, sizeof(*p));
|
|
|
ff3df4 |
return *p;
|
|
|
ff3df4 |
}
|
|
|
ff3df4 |
void __sanitizer_unaligned_store16(uu16 *p, u16 x) {
|
|
|
ff3df4 |
- u16 s = *(uu16 *)&__msan_param_tls[1];
|
|
|
ff3df4 |
- *(uu16 *)MEM_TO_SHADOW((uptr)p) = s;
|
|
|
ff3df4 |
+ static_assert(sizeof(uu16) == sizeof(u16), "incompatible types");
|
|
|
ff3df4 |
+ u16 s;
|
|
|
ff3df4 |
+ internal_memcpy(&s, &__msan_param_tls[1], sizeof(uu16));
|
|
|
ff3df4 |
+ internal_memcpy((void *)MEM_TO_SHADOW((uptr)p), &s, sizeof(uu16));
|
|
|
ff3df4 |
if (s && __msan_get_track_origins())
|
|
|
ff3df4 |
if (uu32 o = __msan_param_origin_tls[2])
|
|
|
ff3df4 |
SetOriginIfPoisoned((uptr)p, (uptr)&s, sizeof(s), o);
|
|
|
ff3df4 |
*p = x;
|
|
|
ff3df4 |
}
|
|
|
ff3df4 |
void __sanitizer_unaligned_store32(uu32 *p, u32 x) {
|
|
|
ff3df4 |
- u32 s = *(uu32 *)&__msan_param_tls[1];
|
|
|
ff3df4 |
- *(uu32 *)MEM_TO_SHADOW((uptr)p) = s;
|
|
|
ff3df4 |
+ static_assert(sizeof(uu32) == sizeof(u32), "incompatible types");
|
|
|
ff3df4 |
+ u32 s;
|
|
|
ff3df4 |
+ internal_memcpy(&s, &__msan_param_tls[1], sizeof(uu32));
|
|
|
ff3df4 |
+ internal_memcpy((void *)MEM_TO_SHADOW((uptr)p), &s, sizeof(uu32));
|
|
|
ff3df4 |
if (s && __msan_get_track_origins())
|
|
|
ff3df4 |
if (uu32 o = __msan_param_origin_tls[2])
|
|
|
ff3df4 |
SetOriginIfPoisoned((uptr)p, (uptr)&s, sizeof(s), o);
|
|
|
ff3df4 |
--
|
|
|
ff3df4 |
2.25.2
|
|
|
ff3df4 |
|