diff options
author | Alexey Samsonov <samsonov@google.com> | 2013-06-27 07:50:56 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2013-06-27 07:50:56 +0000 |
commit | c2918bf11fc65b1f9551eee03719e9bdf02eedd5 (patch) | |
tree | e214f33708ba698443513c65b493dcbe21e85fa4 | |
parent | f2c844564c14e5438494083bf6db304a33673df2 (diff) |
[MSan] Rename __msan_unpoision_param to __msan::UnpoisonParam - it shouldn't be in interface
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@185062 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/msan/msan.cc | 8 | ||||
-rw-r--r-- | lib/msan/msan.h | 2 | ||||
-rw-r--r-- | lib/msan/msan_interceptors.cc | 4 | ||||
-rw-r--r-- | lib/msan/msan_interface_internal.h | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc index 15730663b..eb53e7b55 100644 --- a/lib/msan/msan.cc +++ b/lib/msan/msan.cc @@ -221,6 +221,10 @@ void PrintWarningWithOrigin(uptr pc, uptr bp, u32 origin) { } } +void UnpoisonParam(uptr n) { + internal_memset(__msan_param_tls, 0, n * sizeof(*__msan_param_tls)); +} + } // namespace __msan // Interface. @@ -347,10 +351,6 @@ void __msan_print_param_shadow() { Printf("\n"); } -void __msan_unpoison_param(uptr n) { - internal_memset(__msan_param_tls, 0, n * sizeof(*__msan_param_tls)); -} - sptr __msan_test_shadow(const void *x, uptr size) { unsigned char *s = (unsigned char*)MEM_TO_SHADOW((uptr)x); for (uptr i = 0; i < size; ++i) diff --git a/lib/msan/msan.h b/lib/msan/msan.h index baaba49f4..a7bd478c7 100644 --- a/lib/msan/msan.h +++ b/lib/msan/msan.h @@ -77,6 +77,8 @@ void ReportExpectedUMRNotFound(StackTrace *stack); void ReportAtExitStatistics(); void UnpoisonMappedDSO(struct link_map *map); +// Unpoison first n function arguments. +void UnpoisonParam(uptr n); #define GET_MALLOC_STACK_TRACE \ StackTrace stack; \ diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index df45ca207..2c1963d04 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -839,7 +839,7 @@ static int msan_dl_iterate_phdr_cb(__sanitizer_dl_phdr_info *info, SIZE_T size, __msan_unpoison(info->dlpi_name, REAL(strlen)(info->dlpi_name) + 1); } dl_iterate_phdr_data *cbdata = (dl_iterate_phdr_data *)data; - __msan_unpoison_param(3); + UnpoisonParam(3); return cbdata->callback(info, size, cbdata->data); } @@ -874,7 +874,7 @@ static void SignalHandler(int signo) { } static void SignalAction(int signo, void *si, void *uc) { - __msan_unpoison_param(3); + UnpoisonParam(3); __msan_unpoison(si, __sanitizer::struct_sigaction_sz); __msan_unpoison(uc, __sanitizer::ucontext_t_sz); diff --git a/lib/msan/msan_interface_internal.h b/lib/msan/msan_interface_internal.h index 098e6f3b3..a5502eef1 100644 --- a/lib/msan/msan_interface_internal.h +++ b/lib/msan/msan_interface_internal.h @@ -124,9 +124,6 @@ void __msan_partial_poison(const void* data, void* shadow, uptr size); SANITIZER_INTERFACE_ATTRIBUTE void __msan_allocated_memory(const void* data, uptr size); -// Unpoison first n function arguments. -void __msan_unpoison_param(uptr n); - SANITIZER_INTERFACE_ATTRIBUTE u16 __sanitizer_unaligned_load16(const uu16 *p); |