[Msan] Fix the if_indextoname.cc test to pass on FreeBSD

Differential Revision: http://reviews.llvm.org/D9456

llvm-svn: 236999

2 files changed, 3 insertions, 2 deletions

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
index 16312a3193f..9b3e99b7bc8 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -226,7 +226,8 @@
 #define SANITIZER_INTERCEPT_GETRESID SI_LINUX
 #define SANITIZER_INTERCEPT_GETIFADDRS \
   SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
-#define SANITIZER_INTERCEPT_IF_INDEXTONAME SI_LINUX_NOT_ANDROID || SI_MAC
+#define SANITIZER_INTERCEPT_IF_INDEXTONAME \
+  SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
 #define SANITIZER_INTERCEPT_CAPGET SI_LINUX_NOT_ANDROID
 #define SANITIZER_INTERCEPT_AEABI_MEM SI_LINUX && defined(__arm__)
 #define SANITIZER_INTERCEPT___BZERO SI_MAC
diff --git a/compiler-rt/test/msan/if_indextoname.cc b/compiler-rt/test/msan/if_indextoname.cc
index 7f7dea7d51f..7b1b989e57d 100644
--- a/compiler-rt/test/msan/if_indextoname.cc
+++ b/compiler-rt/test/msan/if_indextoname.cc
@@ -18,6 +18,6 @@ int main(int argc, char *argv[]) {
     printf("No network interfaces found.\n");
     return 0;
   }
-  assert(strlen(ifname) + 1 == __msan_test_shadow(ifname, sizeof(ifname)));
+  assert(strlen(ifname) + 1 <= __msan_test_shadow(ifname, sizeof(ifname)));
   return 0;
 }