From 4622301b0dd6b595d51be6a6b9e39b177d0abb6a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 11 Jun 2014 11:35:48 +0000 Subject: [PATCH] asan_linux.cc: Cherry pick upstream r210012. 2014-06-11 Richard Biener * asan/asan_linux.cc: Cherry pick upstream r210012. From-SVN: r211453 --- libsanitizer/ChangeLog | 4 ++++ libsanitizer/asan/asan_linux.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index b441ea3b705..af3b8a30f8e 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,7 @@ +2014-06-11 Richard Biener + + * asan/asan_linux.cc: Cherry pick upstream r210012. + 2014-05-30 Jakub Jelinek * sanitizer_common/sanitizer_stacktrace.cc: Cherry pick upstream diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc index c401d9df48b..08d2885e548 100644 --- a/libsanitizer/asan/asan_linux.cc +++ b/libsanitizer/asan/asan_linux.cc @@ -89,6 +89,10 @@ static int FindFirstDSOCallback(struct dl_phdr_info *info, size_t size, if (!info->dlpi_name || info->dlpi_name[0] == 0) return 0; + // Ignore vDSO + if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0) + return 0; + *(const char **)data = info->dlpi_name; return 1; }