diff options
| -rw-r--r-- | include/sanitizer/linux_syscall_hooks.h | 3 | ||||
| -rw-r--r-- | include/sanitizer/lsan_interface.h | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_allocator.h | 4 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_common_syscalls.inc | 1 | ||||
| -rwxr-xr-x | lib/sanitizer_common/scripts/check_lint.sh | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/include/sanitizer/linux_syscall_hooks.h b/include/sanitizer/linux_syscall_hooks.h index 5f898228f..13bb1a9d7 100644 --- a/include/sanitizer/linux_syscall_hooks.h +++ b/include/sanitizer/linux_syscall_hooks.h @@ -47,7 +47,8 @@ void __sanitizer_syscall_post_waitpid(long res, int pid, int *status, int options); void __sanitizer_syscall_post_clock_gettime(long res, int clk_id, void *tp); void __sanitizer_syscall_post_clock_getres(long res, int clk_id, void *tp); -void __sanitizer_syscall_post_read(long res, unsigned int fd, void *buf, size_t count); +void __sanitizer_syscall_post_read(long res, unsigned int fd, void *buf, + size_t count); // And now a few syscalls we don't handle yet. diff --git a/include/sanitizer/lsan_interface.h b/include/sanitizer/lsan_interface.h index 96ddc84ef..df256c0e5 100644 --- a/include/sanitizer/lsan_interface.h +++ b/include/sanitizer/lsan_interface.h @@ -35,7 +35,7 @@ extern "C" { // you have intentional memory leaks in your shutdown code). Calling this // function overrides end-of-process leak checking; it must be called at // most once per process. This function will terminate the process if there - // are memory leaks and the exit_code flag is non-zero. + // are memory leaks and the exit_code flag is non-zero. void __lsan_do_leak_check(); #ifdef __cplusplus } // extern "C" diff --git a/lib/sanitizer_common/sanitizer_allocator.h b/lib/sanitizer_common/sanitizer_allocator.h index f7e2b8996..ada1a0c33 100644 --- a/lib/sanitizer_common/sanitizer_allocator.h +++ b/lib/sanitizer_common/sanitizer_allocator.h @@ -1127,7 +1127,9 @@ class LargeMmapAllocator { CHECK(IsAligned(p, page_size_)); return reinterpret_cast<Header*>(p - page_size_); } - Header *GetHeader(const void *p) { return GetHeader(reinterpret_cast<uptr>(p)); } + Header *GetHeader(const void *p) { + return GetHeader(reinterpret_cast<uptr>(p)); + } void *GetUser(Header *h) { CHECK(IsAligned((uptr)h, page_size_)); diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc index 3f728d340..87d684130 100644 --- a/lib/sanitizer_common/sanitizer_common_syscalls.inc +++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc @@ -169,7 +169,6 @@ PRE_SYSCALL(read)(unsigned int fd, void *buf, uptr count) { POST_SYSCALL(read)(long res, unsigned int fd, void *buf, uptr count) { if (res > 0 && buf) POST_WRITE(buf, res); } - } // extern "C" #undef PRE_SYSCALL diff --git a/lib/sanitizer_common/scripts/check_lint.sh b/lib/sanitizer_common/scripts/check_lint.sh index 246add109..b24684e15 100755 --- a/lib/sanitizer_common/scripts/check_lint.sh +++ b/lib/sanitizer_common/scripts/check_lint.sh @@ -40,8 +40,8 @@ cd ${LLVM_CHECKOUT} # LLVM Instrumentation LLVM_INSTRUMENTATION=lib/Transforms/Instrumentation LLVM_LINT_FILTER=-,+whitespace -${CPPLINT} --filter=${LLVM_LINT_FILTER} ${LLVM_INSTRUMENTATION}/*Sanitizer.cpp \ - ${LLVM_INSTRUMENTATION}/BlackList.* +${CPPLINT} --filter=${LLVM_LINT_FILTER} lib/Transforms/Instrumentation/*Sanitizer.cpp \ + lib/Transforms/Utils/SpecialCaseList.cpp COMPILER_RT=projects/compiler-rt |