Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: base/allocator/partition_allocator/address_space_randomization.cc

Issue 2780733002: Use the full 47 bits of address space on Windows >= 8.1. (Closed)
Patch Set: Use base::win::GetVersion. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/partition_allocator/address_space_randomization.cc
diff --git a/base/allocator/partition_allocator/address_space_randomization.cc b/base/allocator/partition_allocator/address_space_randomization.cc
index d710e006bfdc686d9df3ab17befcbcde38f9b5a8..ca9efdd8be49e527e901358d2db0b1ed43cd0ae3 100644
--- a/base/allocator/partition_allocator/address_space_randomization.cc
+++ b/base/allocator/partition_allocator/address_space_randomization.cc
@@ -6,6 +6,7 @@
#include "base/allocator/partition_allocator/page_allocator.h"
#include "base/allocator/partition_allocator/spin_lock.h"
+#include "base/win/windows_version.h"
#include "build/build_config.h"
#if defined(OS_WIN)
@@ -89,11 +90,11 @@ void* GetRandomPageBase() {
// This address mask gives a low likelihood of address space collisions. We
// handle the situation gracefully if there is a collision.
#if defined(OS_WIN)
- // 64-bit Windows has a bizarrely small 8TB user address space. Allocates in
- // the 1-5TB region. TODO(palmer): See if Windows >= 8.1 has the full 47 bits,
- // and use it if so. crbug.com/672219
random &= 0x3ffffffffffUL;
- random += 0x10000000000UL;
+ // Windows >= 8.1 has the full 47 bits. Use them where available.
+ if (base::win::GetVersion() < base::win::Version::VERSION_WIN8_1) {
+ random += 0x10000000000UL;
+ }
#elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
// This range is copied from the TSan source, but works for all tools.
random &= 0x007fffffffffUL;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698