| Index: src/platform-linux.cc
|
| ===================================================================
|
| --- src/platform-linux.cc (revision 8640)
|
| +++ src/platform-linux.cc (working copy)
|
| @@ -78,13 +78,31 @@
|
| static Mutex* limit_mutex = NULL;
|
|
|
|
|
| +static void* GetRandomMmapAddr() {
|
| + Isolate* isolate;
|
| + // Note that the current isolate isn't set up in a call path via
|
| + // CpuFeatures::Probe. We don't care about randomization in this case because
|
| + // the code page is immediately freed.
|
| + if (sizeof(void*) == 8 && (isolate = Isolate::UncheckedCurrent())) {
|
| + uint32_t rnd1 = V8::RandomPrivate(isolate);
|
| + uint32_t rnd2 = V8::RandomPrivate(isolate);
|
| + uint64_t raw_addr = (static_cast<uint64_t>(rnd1) << 33) |
|
| + (static_cast<uint64_t>(rnd2) << 2);
|
| + raw_addr &= 0x00003ffffffff000ULL;
|
| + return reinterpret_cast<void*>(raw_addr);
|
| + } else {
|
| + return NULL;
|
| + }
|
| +}
|
| +
|
| +
|
| void OS::Setup() {
|
| // Seed the random number generator.
|
| // Convert the current time to a 64-bit integer first, before converting it
|
| // to an unsigned. Going directly can cause an overflow and the seed to be
|
| // set to all ones. The seed will be identical for different instances that
|
| // call this setup code within the same millisecond.
|
| - uint64_t seed = static_cast<uint64_t>(TimeCurrentMillis());
|
| + uint64_t seed = Ticks() | (getpid() << 16);
|
| srandom(static_cast<unsigned int>(seed));
|
| limit_mutex = CreateMutex();
|
|
|
| @@ -367,10 +385,10 @@
|
| void* OS::Allocate(const size_t requested,
|
| size_t* allocated,
|
| bool is_executable) {
|
| - // TODO(805): Port randomization of allocated executable memory to Linux.
|
| const size_t msize = RoundUp(requested, sysconf(_SC_PAGESIZE));
|
| int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0);
|
| - void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
| + void* addr = GetRandomMmapAddr();
|
| + void* mbase = mmap(addr, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
| if (mbase == MAP_FAILED) {
|
| LOG(i::Isolate::Current(),
|
| StringEvent("OS::Allocate", "mmap failed"));
|
| @@ -586,7 +604,7 @@
|
|
|
|
|
| VirtualMemory::VirtualMemory(size_t size) {
|
| - address_ = mmap(NULL, size, PROT_NONE,
|
| + address_ = mmap(GetRandomMmapAddr(), size, PROT_NONE,
|
| MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE,
|
| kMmapFd, kMmapFdOffset);
|
| size_ = size;
|
|
|