[GWP-ASan] Add thread ID to PRNG seed.
am: 1a126512f4
Change-Id: I368ec0abf2197bd5e22c58859265e90b85bf4a59
diff --git a/gwp_asan/guarded_pool_allocator.h b/gwp_asan/guarded_pool_allocator.h
index 400d50c..28a4111 100644
--- a/gwp_asan/guarded_pool_allocator.h
+++ b/gwp_asan/guarded_pool_allocator.h
@@ -132,6 +132,10 @@
// occur.
static void reportError(uintptr_t AccessPtr, Error E = Error::UNKNOWN);
+ // Get the current thread ID, or kInvalidThreadID if failure. Note: This
+ // implementation is platform-specific.
+ static uint64_t getThreadID();
+
private:
static constexpr size_t kInvalidSlotID = SIZE_MAX;
@@ -146,10 +150,6 @@
void markReadWrite(void *Ptr, size_t Size) const;
void markInaccessible(void *Ptr, size_t Size) const;
- // Get the current thread ID, or kInvalidThreadID if failure. Note: This
- // implementation is platform-specific.
- static uint64_t getThreadID();
-
// Get the page size from the platform-specific implementation. Only needs to
// be called once, and the result should be cached in PageSize in this class.
static size_t getPlatformPageSize();
diff --git a/gwp_asan/random.cpp b/gwp_asan/random.cpp
index 67f4a22..90493da 100644
--- a/gwp_asan/random.cpp
+++ b/gwp_asan/random.cpp
@@ -7,12 +7,14 @@
//===----------------------------------------------------------------------===//
#include "gwp_asan/random.h"
+#include "gwp_asan/guarded_pool_allocator.h"
#include <time.h>
namespace gwp_asan {
uint32_t getRandomUnsigned32() {
- thread_local uint32_t RandomState = static_cast<uint64_t>(time(nullptr));
+ thread_local uint32_t RandomState =
+ time(nullptr) + GuardedPoolAllocator::getThreadID();
RandomState ^= RandomState << 13;
RandomState ^= RandomState >> 17;
RandomState ^= RandomState << 5;