diff options
-rw-r--r-- | lib/asan/asan_poisoning.cc | 12 | ||||
-rw-r--r-- | lib/msan/msan.cc | 36 | ||||
-rw-r--r-- | lib/msan/msan_interface_internal.h | 12 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_internal_defs.h | 8 | ||||
-rw-r--r-- | lib/tsan/rtl/tsan_interface.cc | 24 | ||||
-rw-r--r-- | lib/tsan/rtl/tsan_interface.h | 12 |
6 files changed, 56 insertions, 48 deletions
diff --git a/lib/asan/asan_poisoning.cc b/lib/asan/asan_poisoning.cc index 772b5e64b..59309535d 100644 --- a/lib/asan/asan_poisoning.cc +++ b/lib/asan/asan_poisoning.cc @@ -183,37 +183,37 @@ uptr __asan_region_is_poisoned(uptr beg, uptr size) { extern "C" SANITIZER_INTERFACE_ATTRIBUTE -u16 __sanitizer_unaligned_load16(const u16 *p) { +u16 __sanitizer_unaligned_load16(const uu16 *p) { CHECK_SMALL_REGION(p, sizeof(*p), false); return *p; } extern "C" SANITIZER_INTERFACE_ATTRIBUTE -u32 __sanitizer_unaligned_load32(const u32 *p) { +u32 __sanitizer_unaligned_load32(const uu32 *p) { CHECK_SMALL_REGION(p, sizeof(*p), false); return *p; } extern "C" SANITIZER_INTERFACE_ATTRIBUTE -u64 __sanitizer_unaligned_load64(const u64 *p) { +u64 __sanitizer_unaligned_load64(const uu64 *p) { CHECK_SMALL_REGION(p, sizeof(*p), false); return *p; } extern "C" SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_unaligned_store16(u16 *p, u16 x) { +void __sanitizer_unaligned_store16(uu16 *p, u16 x) { CHECK_SMALL_REGION(p, sizeof(*p), true); *p = x; } extern "C" SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_unaligned_store32(u32 *p, u32 x) { +void __sanitizer_unaligned_store32(uu32 *p, u32 x) { CHECK_SMALL_REGION(p, sizeof(*p), true); *p = x; } extern "C" SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_unaligned_store64(u64 *p, u64 x) { +void __sanitizer_unaligned_store64(uu64 *p, u64 x) { CHECK_SMALL_REGION(p, sizeof(*p), true); *p = x; } diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc index 95b9110b7..cf7b01c3d 100644 --- a/lib/msan/msan.cc +++ b/lib/msan/msan.cc @@ -459,29 +459,29 @@ u32 __msan_get_umr_origin() { return __msan_origin_tls; } -u16 __sanitizer_unaligned_load16(const void *p) { - __msan_retval_tls[0] = *(u16 *)MEM_TO_SHADOW((uptr)p); - return *(u16 *)p; +u16 __sanitizer_unaligned_load16(const uu16 *p) { + __msan_retval_tls[0] = *(uu16 *)MEM_TO_SHADOW((uptr)p); + return *p; } -u32 __sanitizer_unaligned_load32(const void *p) { - __msan_retval_tls[0] = *(u32 *)MEM_TO_SHADOW((uptr)p); - return *(u32 *)p; +u32 __sanitizer_unaligned_load32(const uu32 *p) { + __msan_retval_tls[0] = *(uu32 *)MEM_TO_SHADOW((uptr)p); + return *p; } -u64 __sanitizer_unaligned_load64(const void *p) { - __msan_retval_tls[0] = *(u64 *)MEM_TO_SHADOW((uptr)p); - return *(u64 *)p; +u64 __sanitizer_unaligned_load64(const uu64 *p) { + __msan_retval_tls[0] = *(uu64 *)MEM_TO_SHADOW((uptr)p); + return *p; } -void __sanitizer_unaligned_store16(void *p, u16 x) { - *(u16 *)MEM_TO_SHADOW((uptr)p) = __msan_param_tls[1]; - *(u16 *)p = x; +void __sanitizer_unaligned_store16(uu16 *p, u16 x) { + *(uu16 *)MEM_TO_SHADOW((uptr)p) = __msan_param_tls[1]; + *p = x; } -void __sanitizer_unaligned_store32(void *p, u32 x) { - *(u32 *)MEM_TO_SHADOW((uptr)p) = __msan_param_tls[1]; - *(u32 *)p = x; +void __sanitizer_unaligned_store32(uu32 *p, u32 x) { + *(uu32 *)MEM_TO_SHADOW((uptr)p) = __msan_param_tls[1]; + *p = x; } -void __sanitizer_unaligned_store64(void *p, u64 x) { - *(u64 *)MEM_TO_SHADOW((uptr)p) = __msan_param_tls[1]; - *(u64 *)p = x; +void __sanitizer_unaligned_store64(uu64 *p, u64 x) { + *(uu64 *)MEM_TO_SHADOW((uptr)p) = __msan_param_tls[1]; + *p = x; } #if !SANITIZER_SUPPORTS_WEAK_HOOKS diff --git a/lib/msan/msan_interface_internal.h b/lib/msan/msan_interface_internal.h index 0dcb926cb..f3d8ee3ef 100644 --- a/lib/msan/msan_interface_internal.h +++ b/lib/msan/msan_interface_internal.h @@ -125,22 +125,22 @@ void __msan_allocated_memory(const void* data, uptr size); void __msan_unpoison_param(uptr n); SANITIZER_INTERFACE_ATTRIBUTE -u16 __sanitizer_unaligned_load16(const void *p); +u16 __sanitizer_unaligned_load16(const uu16 *p); SANITIZER_INTERFACE_ATTRIBUTE -u32 __sanitizer_unaligned_load32(const void *p); +u32 __sanitizer_unaligned_load32(const uu32 *p); SANITIZER_INTERFACE_ATTRIBUTE -u64 __sanitizer_unaligned_load64(const void *p); +u64 __sanitizer_unaligned_load64(const uu64 *p); SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_unaligned_store16(void *p, u16 x); +void __sanitizer_unaligned_store16(uu16 *p, u16 x); SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_unaligned_store32(void *p, u32 x); +void __sanitizer_unaligned_store32(uu32 *p, u32 x); SANITIZER_INTERFACE_ATTRIBUTE -void __sanitizer_unaligned_store64(void *p, u64 x); +void __sanitizer_unaligned_store64(uu64 *p, u64 x); } // extern "C" #endif // MSAN_INTERFACE_INTERNAL_H diff --git a/lib/sanitizer_common/sanitizer_internal_defs.h b/lib/sanitizer_common/sanitizer_internal_defs.h index 14d7fb37b..3a7f8a9ac 100644 --- a/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/lib/sanitizer_common/sanitizer_internal_defs.h @@ -68,6 +68,14 @@ typedef signed int s32; typedef signed long long s64; // NOLINT typedef int fd_t; +// Unaligned versions. +typedef __attribute__((aligned(1))) u16 uu16; +typedef __attribute__((aligned(1))) u32 uu32; +typedef __attribute__((aligned(1))) u64 uu64; +typedef __attribute__((aligned(1))) s16 us16; +typedef __attribute__((aligned(1))) s32 us32; +typedef __attribute__((aligned(1))) s64 us64; + // WARNING: OFF_T may be different from OS type off_t, depending on the value of // _FILE_OFFSET_BITS. This definition of OFF_T matches the ABI of system calls // like pread and mmap, as opposed to pread64 and mmap64. diff --git a/lib/tsan/rtl/tsan_interface.cc b/lib/tsan/rtl/tsan_interface.cc index efad8c192..b4cdb3a4f 100644 --- a/lib/tsan/rtl/tsan_interface.cc +++ b/lib/tsan/rtl/tsan_interface.cc @@ -38,34 +38,34 @@ void __tsan_write16(void *addr) { MemoryWrite(cur_thread(), CALLERPC, (uptr)addr + 8, kSizeLog8); } -u16 __tsan_unaligned_read2(void *addr) { +u16 __tsan_unaligned_read2(const uu16 *addr) { UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 2, false, false); - return *(u16*)addr; + return *addr; } -u32 __tsan_unaligned_read4(void *addr) { +u32 __tsan_unaligned_read4(const uu32 *addr) { UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 4, false, false); - return *(u32*)addr; + return *addr; } -u64 __tsan_unaligned_read8(void *addr) { +u64 __tsan_unaligned_read8(const uu64 *addr) { UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 8, false, false); - return *(u64*)addr; + return *addr; } -void __tsan_unaligned_write2(void *addr, u16 v) { +void __tsan_unaligned_write2(uu16 *addr, u16 v) { UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 2, true, false); - *(u16*)addr = v; + *addr = v; } -void __tsan_unaligned_write4(void *addr, u32 v) { +void __tsan_unaligned_write4(uu32 *addr, u32 v) { UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 4, true, false); - *(u32*)addr = v; + *addr = v; } -void __tsan_unaligned_write8(void *addr, u64 v) { +void __tsan_unaligned_write8(uu64 *addr, u64 v) { UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 8, true, false); - *(u64*)addr = v; + *addr = v; } extern "C" { diff --git a/lib/tsan/rtl/tsan_interface.h b/lib/tsan/rtl/tsan_interface.h index 457fb55e0..eb75400ec 100644 --- a/lib/tsan/rtl/tsan_interface.h +++ b/lib/tsan/rtl/tsan_interface.h @@ -41,12 +41,12 @@ void __tsan_write4(void *addr) SANITIZER_INTERFACE_ATTRIBUTE; void __tsan_write8(void *addr) SANITIZER_INTERFACE_ATTRIBUTE; void __tsan_write16(void *addr) SANITIZER_INTERFACE_ATTRIBUTE; -u16 __tsan_unaligned_read2(void *addr) SANITIZER_INTERFACE_ATTRIBUTE; -u32 __tsan_unaligned_read4(void *addr) SANITIZER_INTERFACE_ATTRIBUTE; -u64 __tsan_unaligned_read8(void *addr) SANITIZER_INTERFACE_ATTRIBUTE; -void __tsan_unaligned_write2(void *addr, u16 v) SANITIZER_INTERFACE_ATTRIBUTE; -void __tsan_unaligned_write4(void *addr, u32 v) SANITIZER_INTERFACE_ATTRIBUTE; -void __tsan_unaligned_write8(void *addr, u64 v) SANITIZER_INTERFACE_ATTRIBUTE; +u16 __tsan_unaligned_read2(const uu16 *addr) SANITIZER_INTERFACE_ATTRIBUTE; +u32 __tsan_unaligned_read4(const uu32 *addr) SANITIZER_INTERFACE_ATTRIBUTE; +u64 __tsan_unaligned_read8(const uu64 *addr) SANITIZER_INTERFACE_ATTRIBUTE; +void __tsan_unaligned_write2(uu16 *addr, u16 v) SANITIZER_INTERFACE_ATTRIBUTE; +void __tsan_unaligned_write4(uu32 *addr, u32 v) SANITIZER_INTERFACE_ATTRIBUTE; +void __tsan_unaligned_write8(uu64 *addr, u64 v) SANITIZER_INTERFACE_ATTRIBUTE; void __tsan_vptr_read(void **vptr_p) SANITIZER_INTERFACE_ATTRIBUTE; void __tsan_vptr_update(void **vptr_p, void *new_val) |