[PATCH] D66391: [Sanitizer] arc4random interception on Mac

[David CARLIER via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL369285: [Sanitizer] arc4random interception on Mac (authored by devnexen, committed by ).
Herald added a subscriber: delcypher.

Changed prior to commit:
  https://reviews.llvm.org/D66391?vs=215937&id=215953#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D66391/new/

https://reviews.llvm.org/D66391

Files:
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cpp
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
  compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/arc4random.cpp


Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cpp
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cpp
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cpp
@@ -13,6 +13,7 @@
 #include "sanitizer_platform.h"
 #if SANITIZER_MAC
 #include "sanitizer_mac.h"
+#include "interception/interception.h"
 
 // Use 64-bit inodes in file operations. ASan does not support OS X 10.5, so
 // the clients will most certainly use 64-bit ones as well.
@@ -1181,7 +1182,7 @@
   if (!buffer || !length || length > 256)
     return false;
   // arc4random never fails.
-  arc4random_buf(buffer, length);
+  REAL(arc4random_buf)(buffer, length);
   return true;
 }
 
Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -561,7 +561,7 @@
 #define SANITIZER_INTERCEPT_FUNOPEN (SI_NETBSD || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_FUNOPEN2 SI_NETBSD
 #define SANITIZER_INTERCEPT_GETFSENT (SI_FREEBSD || SI_NETBSD || SI_MAC)
-#define SANITIZER_INTERCEPT_ARC4RANDOM (SI_FREEBSD || SI_NETBSD)
+#define SANITIZER_INTERCEPT_ARC4RANDOM (SI_FREEBSD || SI_NETBSD || SI_MAC)
 #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
 #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID)
 #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD)
Index: compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/arc4random.cpp
===================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/arc4random.cpp
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/arc4random.cpp
@@ -1,6 +1,6 @@
 // RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
 //
-// UNSUPPORTED: linux, darwin, solaris
+// UNSUPPORTED: linux, solaris
 
 #include <cstdlib>
 #include <ctime>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66391.215953.patch
Type: text/x-patch
Size: 2066 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190819/16b09de7/attachment.bin>