dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm] Maintain W^X when mapping snapshots on Windows.

Browse Source 
TEST=ci
Bug: https://github.com/dart-lang/sdk/issues/62249
Change-Id: I4ee4e7420527907d20217916acbc4162d9a53800
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/468441
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak
2025-12-16 09:22:52 -08:00
committed by Commit Queue
parent 275581bca1
commit ee4ec6c84d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/bin/file_win.cc
+7 -10
View File
@@ -86,26 +86,23 @@ MappedMemory* File::Map(File::MapType type,
int64_t position,
int64_t length,
void* start) {
DWORD prot_alloc;
DWORD prot_final;
DWORD prot = PAGE_NOACCESS;
switch (type) {
case File::kReadOnly:
prot_alloc = PAGE_READWRITE;
prot_final = PAGE_READONLY;
prot = PAGE_READONLY;
break;
case File::kReadExecute:
prot_alloc = PAGE_EXECUTE_READWRITE;
prot_final = PAGE_EXECUTE_READ;
prot = PAGE_EXECUTE_READ;
break;
case File::kReadWrite:
prot_alloc = PAGE_READWRITE;
prot_final = PAGE_READWRITE;
prot = PAGE_READWRITE;
break;
}
void* addr = start;
if (addr == nullptr) {
addr = VirtualAlloc(nullptr, length, MEM_COMMIT | MEM_RESERVE, prot_alloc);
addr =
VirtualAlloc(nullptr, length, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
if (addr == nullptr) {
int error = GetLastError();
char buffer[1024];
@@ -136,7 +133,7 @@ MappedMemory* File::Map(File::MapType type,
}
DWORD old_prot;
bool result = VirtualProtect(addr, length, prot_final, &old_prot);
bool result = VirtualProtect(addr, length, prot, &old_prot);
if (!result) {
int error = GetLastError();
char buffer[1024];