ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Kernel] Zeroing out pages without write protect flag

This commit is contained in:
Gliniak 2020-11-29 12:03:17 +01:00 committed by Rick Gibbed
parent 1513dd235b
commit ff5c5f01e0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xenia/kernel/xboxkrnl/xboxkrnl_memory.cc
View File

@ -135,8 +135,10 @@ dword_result_t NtAllocateVirtualMemory(lpdword_t base_addr_ptr,
} }
uint32_t protect = FromXdkProtectFlags(protect_bits); uint32_t protect = FromXdkProtectFlags(protect_bits);
uint32_t address = 0; uint32_t address = 0;
BaseHeap* heap;
if (adjusted_base != 0) { if (adjusted_base != 0) {
auto heap = kernel_memory()->LookupHeap(adjusted_base); heap = kernel_memory()->LookupHeap(adjusted_base);
if (heap->page_size() != page_size) { if (heap->page_size() != page_size) {
// Specified the wrong page size for the wrong heap. // Specified the wrong page size for the wrong heap.
return X_STATUS_ACCESS_DENIED; return X_STATUS_ACCESS_DENIED;
@ -148,7 +150,7 @@ dword_result_t NtAllocateVirtualMemory(lpdword_t base_addr_ptr,
} }
} else { } else {
bool top_down = !!(alloc_type & X_MEM_TOP_DOWN); bool top_down = !!(alloc_type & X_MEM_TOP_DOWN);
auto heap = kernel_memory()->LookupHeapByType(false, page_size); heap = kernel_memory()->LookupHeapByType(false, page_size);
heap->Alloc(adjusted_size, page_size, allocation_type, protect, top_down, heap->Alloc(adjusted_size, page_size, allocation_type, protect, top_down,
&address); &address);
} }
@ -160,7 +162,14 @@ dword_result_t NtAllocateVirtualMemory(lpdword_t base_addr_ptr,
// Zero memory, if needed. // Zero memory, if needed.
if (address && !(alloc_type & X_MEM_NOZERO)) { if (address && !(alloc_type & X_MEM_NOZERO)) {
if (alloc_type & X_MEM_COMMIT) { if (alloc_type & X_MEM_COMMIT) {
if (!(protect & kMemoryProtectWrite)) {
heap->Protect(address, adjusted_size,
kMemoryProtectRead | kMemoryProtectWrite);
}
kernel_memory()->Zero(address, adjusted_size); kernel_memory()->Zero(address, adjusted_size);
if (!(protect & kMemoryProtectWrite)) {
heap->Protect(address, adjusted_size, protect);
}
} }
} }