[compiler-rt] r303339 - Revert r302781 and subsequent attempts to disable part of it.
Kostya Serebryany via llvm-commits
llvm-commits at lists.llvm.org
Thu May 18 09:58:35 PDT 2017
ouch. thanks!
On Thu, May 18, 2017 at 2:31 AM, Daniel Jasper via llvm-commits <
llvm-commits at lists.llvm.org> wrote:
> Author: djasper
> Date: Thu May 18 04:31:37 2017
> New Revision: 303339
>
> URL: http://llvm.org/viewvc/llvm-project?rev=303339&view=rev
> Log:
> Revert r302781 and subsequent attempts to disable part of it.
>
> The Msan unit tests are still broken and by this point, I think we
> should start over.
>
> Removed:
> compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
> compiler-rt/trunk/test/msan/strndup.cc
> Modified:
> compiler-rt/trunk/lib/asan/asan_flags.cc
> compiler-rt/trunk/lib/asan/tests/asan_str_test.cc
> compiler-rt/trunk/lib/msan/msan_interceptors.cc
> compiler-rt/trunk/lib/msan/tests/msan_test.cc
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_
> common_interceptors.inc
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.inc
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_
> platform_interceptors.h
> compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h
>
> Modified: compiler-rt/trunk/lib/asan/asan_flags.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> asan/asan_flags.cc?rev=303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/asan/asan_flags.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_flags.cc Thu May 18 04:31:37 2017
> @@ -194,10 +194,6 @@ void InitializeFlags() {
> Report("WARNING: strchr* interceptors are enabled even though "
> "replace_str=0. Use intercept_strchr=0 to disable them.");
> }
> - if (!f->replace_str && common_flags()->intercept_strndup) {
> - Report("WARNING: strndup* interceptors are enabled even though "
> - "replace_str=0. Use intercept_strndup=0 to disable them.");
> - }
> }
>
> } // namespace __asan
>
> Modified: compiler-rt/trunk/lib/asan/tests/asan_str_test.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> asan/tests/asan_str_test.cc?rev=303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/asan/tests/asan_str_test.cc (original)
> +++ compiler-rt/trunk/lib/asan/tests/asan_str_test.cc Thu May 18 04:31:37
> 2017
> @@ -154,27 +154,6 @@ TEST(AddressSanitizer, MAYBE_StrDupOOBTe
> free(str);
> }
>
> -#if SANITIZER_TEST_HAS_STRNDUP
> -TEST(AddressSanitizer, MAYBE_StrNDupOOBTest) {
> - size_t size = Ident(42);
> - char *str = MallocAndMemsetString(size);
> - char *new_str;
> - // Normal strndup calls.
> - str[size - 1] = '\0';
> - new_str = strndup(str, size - 13);
> - free(new_str);
> - new_str = strndup(str + size - 1, 13);
> - free(new_str);
> - // Argument points to not allocated memory.
> - EXPECT_DEATH(Ident(strndup(str - 1, 13)), LeftOOBReadMessage(1));
> - EXPECT_DEATH(Ident(strndup(str + size, 13)), RightOOBReadMessage(0));
> - // Overwrite the terminating '\0' and hit unallocated memory.
> - str[size - 1] = 'z';
> - EXPECT_DEATH(Ident(strndup(str, size + 13)), RightOOBReadMessage(0));
> - free(str);
> -}
> -#endif // SANITIZER_TEST_HAS_STRNDUP
> -
> TEST(AddressSanitizer, StrCpyOOBTest) {
> size_t to_size = Ident(30);
> size_t from_size = Ident(6); // less than to_size
>
> Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> msan/msan_interceptors.cc?rev=303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)
> +++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Thu May 18 04:31:37
> 2017
> @@ -341,6 +341,33 @@ INTERCEPTOR(char *, __strdup, char *src)
> #define MSAN_MAYBE_INTERCEPT___STRDUP
> #endif
>
> +INTERCEPTOR(char *, strndup, char *src, SIZE_T n) {
> + ENSURE_MSAN_INITED();
> + GET_STORE_STACK_TRACE;
> + // On FreeBSD strndup() leverages strnlen().
> + InterceptorScope interceptor_scope;
> + SIZE_T copy_size = REAL(strnlen)(src, n);
> + char *res = REAL(strndup)(src, n);
> + CopyShadowAndOrigin(res, src, copy_size, &stack);
> + __msan_unpoison(res + copy_size, 1); // \0
> + return res;
> +}
> +
> +#if !SANITIZER_FREEBSD
> +INTERCEPTOR(char *, __strndup, char *src, SIZE_T n) {
> + ENSURE_MSAN_INITED();
> + GET_STORE_STACK_TRACE;
> + SIZE_T copy_size = REAL(strnlen)(src, n);
> + char *res = REAL(__strndup)(src, n);
> + CopyShadowAndOrigin(res, src, copy_size, &stack);
> + __msan_unpoison(res + copy_size, 1); // \0
> + return res;
> +}
> +#define MSAN_MAYBE_INTERCEPT___STRNDUP INTERCEPT_FUNCTION(__strndup)
> +#else
> +#define MSAN_MAYBE_INTERCEPT___STRNDUP
> +#endif
> +
> INTERCEPTOR(char *, gcvt, double number, SIZE_T ndigit, char *buf) {
> ENSURE_MSAN_INITED();
> char *res = REAL(gcvt)(number, ndigit, buf);
> @@ -1344,13 +1371,6 @@ int OnExit() {
> return __msan_memcpy(to, from, size); \
> }
>
> -#define COMMON_INTERCEPTOR_COPY_STRING(ctx, to, from, size)
> \
> - do {
> \
> - GET_STORE_STACK_TRACE;
> \
> - CopyShadowAndOrigin(to, from, size, &stack);
> \
> - __msan_unpoison(to + size, 1);
> \
> - } while (false)
> -
> #include "sanitizer_common/sanitizer_platform_interceptors.h"
> #include "sanitizer_common/sanitizer_common_interceptors.inc"
>
> @@ -1518,6 +1538,8 @@ void InitializeInterceptors() {
> INTERCEPT_FUNCTION(stpcpy); // NOLINT
> INTERCEPT_FUNCTION(strdup);
> MSAN_MAYBE_INTERCEPT___STRDUP;
> + INTERCEPT_FUNCTION(strndup);
> + MSAN_MAYBE_INTERCEPT___STRNDUP;
> INTERCEPT_FUNCTION(strncpy); // NOLINT
> INTERCEPT_FUNCTION(gcvt);
> INTERCEPT_FUNCTION(strcat); // NOLINT
>
> Modified: compiler-rt/trunk/lib/msan/tests/msan_test.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> msan/tests/msan_test.cc?rev=303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/msan/tests/msan_test.cc (original)
> +++ compiler-rt/trunk/lib/msan/tests/msan_test.cc Thu May 18 04:31:37 2017
> @@ -1581,8 +1581,7 @@ TEST(MemorySanitizer, strdup) {
> TEST(MemorySanitizer, strndup) {
> char buf[4] = "abc";
> __msan_poison(buf + 2, sizeof(*buf));
> - char *x;
> - EXPECT_UMR(x = strndup(buf, 3));
> + char *x = strndup(buf, 3);
> EXPECT_NOT_POISONED(x[0]);
> EXPECT_NOT_POISONED(x[1]);
> EXPECT_POISONED(x[2]);
> @@ -1594,8 +1593,7 @@ TEST(MemorySanitizer, strndup_short) {
> char buf[4] = "abc";
> __msan_poison(buf + 1, sizeof(*buf));
> __msan_poison(buf + 2, sizeof(*buf));
> - char *x;
> - EXPECT_UMR(x = strndup(buf, 2));
> + char *x = strndup(buf, 2);
> EXPECT_NOT_POISONED(x[0]);
> EXPECT_POISONED(x[1]);
> EXPECT_NOT_POISONED(x[2]);
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_
> common_interceptors.inc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> sanitizer_common/sanitizer_common_interceptors.inc?rev=
> 303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
> (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
> Thu May 18 04:31:37 2017
> @@ -34,8 +34,6 @@
> // COMMON_INTERCEPTOR_MEMSET_IMPL
> // COMMON_INTERCEPTOR_MEMMOVE_IMPL
> // COMMON_INTERCEPTOR_MEMCPY_IMPL
> -// COMMON_INTERCEPTOR_COPY_STRING
> -// COMMON_INTERCEPTOR_STRNDUP_IMPL
> //===-------------------------------------------------------
> ---------------===//
>
> #include "interception/interception.h"
> @@ -219,25 +217,6 @@ bool PlatformHasDifferentMemcpyAndMemmov
> }
> #endif
>
> -#ifndef COMMON_INTERCEPTOR_COPY_STRING
> -#define COMMON_INTERCEPTOR_COPY_STRING(ctx, to, from, size) {}
> -#endif
> -
> -#ifndef COMMON_INTERCEPTOR_STRNDUP_IMPL
> -#define COMMON_INTERCEPTOR_STRNDUP_IMPL(ctx, s, size)
> \
> - COMMON_INTERCEPTOR_ENTER(ctx, strndup, s, size);
> \
> - uptr from_length = internal_strnlen(s, size);
> \
> - uptr copy_length = Min(size, from_length);
> \
> - char *new_mem = (char *)WRAP(malloc)(copy_length + 1);
> \
> - if (common_flags()->intercept_strndup) {
> \
> - COMMON_INTERCEPTOR_READ_RANGE(ctx, s, copy_length + 1);
> \
> - }
> \
> - COMMON_INTERCEPTOR_COPY_STRING(ctx, new_mem, s, copy_length);
> \
> - internal_memcpy(new_mem, s, copy_length);
> \
> - new_mem[copy_length] = '\0';
> \
> - return new_mem;
> -#endif
> -
> struct FileMetadata {
> // For open_memstream().
> char **addr;
> @@ -321,26 +300,6 @@ INTERCEPTOR(SIZE_T, strnlen, const char
> #define INIT_STRNLEN
> #endif
>
> -#if SANITIZER_INTERCEPT_STRNDUP
> -INTERCEPTOR(char*, strndup, const char *s, uptr size) {
> - void *ctx;
> - COMMON_INTERCEPTOR_STRNDUP_IMPL(ctx, s, size);
> -}
> -#define INIT_STRNDUP COMMON_INTERCEPT_FUNCTION(strndup)
> -#else
> -#define INIT_STRNDUP
> -#endif // SANITIZER_INTERCEPT_STRNDUP
> -
> -#if SANITIZER_INTERCEPT___STRNDUP
> -INTERCEPTOR(char*, __strndup, const char *s, uptr size) {
> - void *ctx;
> - COMMON_INTERCEPTOR_STRNDUP_IMPL(ctx, s, size);
> -}
> -#define INIT___STRNDUP COMMON_INTERCEPT_FUNCTION(__strndup)
> -#else
> -#define INIT___STRNDUP
> -#endif // SANITIZER_INTERCEPT___STRNDUP
> -
> #if SANITIZER_INTERCEPT_TEXTDOMAIN
> INTERCEPTOR(char*, textdomain, const char *domainname) {
> void *ctx;
> @@ -6204,8 +6163,6 @@ static void InitializeCommonInterceptors
> INIT_TEXTDOMAIN;
> INIT_STRLEN;
> INIT_STRNLEN;
> - INIT_STRNDUP;
> - INIT___STRNDUP;
> INIT_STRCMP;
> INIT_STRNCMP;
> INIT_STRCASECMP;
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.inc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> sanitizer_common/sanitizer_flags.inc?rev=303339&r1=
> 303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.inc (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.inc Thu May 18
> 04:31:37 2017
> @@ -195,9 +195,6 @@ COMMON_FLAG(bool, intercept_strpbrk, tru
> COMMON_FLAG(bool, intercept_strlen, true,
> "If set, uses custom wrappers for strlen and strnlen
> functions "
> "to find more errors.")
> -COMMON_FLAG(bool, intercept_strndup, true,
> - "If set, uses custom wrappers for strndup functions "
> - "to find more errors.")
> COMMON_FLAG(bool, intercept_strchr, true,
> "If set, uses custom wrappers for strchr, strchrnul, and
> strrchr "
> "functions to find more errors.")
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_
> platform_interceptors.h
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> sanitizer_common/sanitizer_platform_interceptors.h?rev=
> 303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
> (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
> Thu May 18 04:31:37 2017
> @@ -25,12 +25,6 @@
> # define SI_NOT_WINDOWS 0
> #endif
>
> -#if SANITIZER_POSIX
> -# define SI_POSIX 1
> -#else
> -# define SI_POSIX 0
> -#endif
> -
> #if SANITIZER_LINUX && !SANITIZER_ANDROID
> # define SI_LINUX_NOT_ANDROID 1
> #else
> @@ -75,12 +69,6 @@
> # define SI_UNIX_NOT_MAC 0
> #endif
>
> -#if SANITIZER_LINUX && !SANITIZER_FREEBSD
> -# define SI_LINUX_NOT_FREEBSD 1
> -# else
> -# define SI_LINUX_NOT_FREEBSD 0
> -#endif
> -
> #define SANITIZER_INTERCEPT_STRLEN 1
> #define SANITIZER_INTERCEPT_STRNLEN SI_NOT_MAC
> #define SANITIZER_INTERCEPT_STRCMP 1
> @@ -98,9 +86,6 @@
> #define SANITIZER_INTERCEPT_MEMMOVE 1
> #define SANITIZER_INTERCEPT_MEMCPY 1
> #define SANITIZER_INTERCEPT_MEMCMP 1
> -// temporary disabled until r302781 is reverted or fixed.
> -#define SANITIZER_INTERCEPT_STRNDUP (0 && SI_POSIX)
> -#define SANITIZER_INTERCEPT___STRNDUP (0 && SI_LINUX_NOT_FREEBSD)
> #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
> __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
> # define SI_MAC_DEPLOYMENT_BELOW_10_7 1
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/tests/
> sanitizer_test_utils.h
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/
> sanitizer_common/tests/sanitizer_test_utils.h?rev=
> 303339&r1=303338&r2=303339&view=diff
> ============================================================
> ==================
> --- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h
> (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_test_utils.h
> Thu May 18 04:31:37 2017
> @@ -124,11 +124,4 @@ static inline uint32_t my_rand() {
> # define SANITIZER_TEST_HAS_PRINTF_L 0
> #endif
>
> -#if !defined(_MSC_VER)
> -// Test temporary disabled until r302781 is reverted or fixed.
> -# define SANITIZER_TEST_HAS_STRNDUP 0
> -#else
> -# define SANITIZER_TEST_HAS_STRNDUP 0
> -#endif
> -
> #endif // SANITIZER_TEST_UTILS_H
>
> Removed: compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/
> test/asan/TestCases/Posix/strndup_oob_test.cc?rev=303338&view=auto
> ============================================================
> ==================
> --- compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
> (original)
> +++ compiler-rt/trunk/test/asan/TestCases/Posix/strndup_oob_test.cc
> (removed)
> @@ -1,28 +0,0 @@
> -// RUN: echo DISABLED
> -// DISABLED: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
> -// DISABLED: %clangxx_asan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
> -// DISABLED: %clangxx_asan -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
> -// DISABLED: %clangxx_asan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
> -
> -// When built as C on Linux, strndup is transformed to __strndup.
> -// DISABLED: %clangxx_asan -O3 -xc %s -o %t && not %run %t 2>&1 |
> FileCheck %s
> -
> -// Unwind problem on arm: "main" is missing from the allocation stack
> trace.
> -// UNSUPPORTED: win32,s390,armv7l-unknown-linux-gnueabihf
> -
> -#include <string.h>
> -
> -char kString[] = "foo";
> -
> -int main(int argc, char **argv) {
> - char *copy = strndup(kString, 2);
> - int x = copy[2 + argc]; // BOOM
> - // CHECK: AddressSanitizer: heap-buffer-overflow
> - // CHECK: #0 {{.*}}main {{.*}}strndup_oob_test.cc:[[@LINE-2]]
> - // CHECK-LABEL: allocated by thread T{{.*}} here:
> - // CHECK: #{{[01]}} {{.*}}strndup
> - // CHECK: #{{.*}}main {{.*}}strndup_oob_test.cc:[[@LINE-6]]
> - // CHECK-LABEL: SUMMARY
> - // CHECK: strndup_oob_test.cc:[[@LINE-7]]
> - return x;
> -}
>
> Removed: compiler-rt/trunk/test/msan/strndup.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/
> test/msan/strndup.cc?rev=303338&view=auto
> ============================================================
> ==================
> --- compiler-rt/trunk/test/msan/strndup.cc (original)
> +++ compiler-rt/trunk/test/msan/strndup.cc (removed)
> @@ -1,29 +0,0 @@
> -// RUN: echo DISABLED
> -// DISABLED: %clangxx_msan %s -o %t && not %run %t 2>&1 | FileCheck
> --check-prefix=ON %s
> -// DISABLED: %clangxx_msan %s -o %t && MSAN_OPTIONS=intercept_strndup=0
> %run %t 2>&1 | FileCheck --check-prefix=OFF --allow-empty %s
> -
> -// When built as C on Linux, strndup is transformed to __strndup.
> -// DISABLED: %clangxx_msan -O3 -xc %s -o %t && not %run %t 2>&1 |
> FileCheck --check-prefix=ON %s
> -
> -// UNSUPPORTED: win32
> -
> -#include <assert.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <sanitizer/msan_interface.h>
> -
> -int main(int argc, char **argv) {
> - char kString[4] = "abc";
> - __msan_poison(kString + 2, 1);
> - char *copy = strndup(kString, 4); // BOOM
> - assert(__msan_test_shadow(copy, 4) == 2); // Poisoning is preserved.
> - free(copy);
> - return 0;
> - // ON: Uninitialized bytes in __interceptor_{{(__)?}}strndup at offset
> 2 inside [{{.*}}, 4)
> - // ON: MemorySanitizer: use-of-uninitialized-value
> - // ON: #0 {{.*}}main {{.*}}strndup.cc:[[@LINE-6]]
> - // ON-LABEL: SUMMARY
> - // ON: {{.*}}strndup.cc:[[@LINE-8]]
> - // OFF-NOT: MemorySanitizer
> -}
> -
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170518/bfa5504e/attachment-0001.html>
More information about the llvm-commits
mailing list