mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 04:13:34 +00:00
[NTOSKRNL]
Do not use image base addresses above MmHighestUserAddress in MmMapViewOfSection, because it would first succeed when checking for conflicting memory areas, and thus not try to find a better address, but later fail in MmMapViewOfSegment, which cannot create a memory area in system space (only possible with MmKernelAddressSpace / PsIdleProcess). See issue #5680 for more details. svn path=/trunk/; revision=54096
This commit is contained in:
@@ -87,7 +87,7 @@ MmMapViewOfArm3Section(IN PVOID SectionObject,
|
||||
IN SECTION_INHERIT InheritDisposition,
|
||||
IN ULONG AllocationType,
|
||||
IN ULONG Protect);
|
||||
|
||||
|
||||
//
|
||||
// PeFmtCreateSection depends on the following:
|
||||
//
|
||||
@@ -1633,7 +1633,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace,
|
||||
{
|
||||
DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1819,7 +1819,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace,
|
||||
PMM_REGION Region;
|
||||
ULONG Entry;
|
||||
PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace);
|
||||
|
||||
|
||||
DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked);
|
||||
|
||||
/*
|
||||
@@ -4626,6 +4626,12 @@ MmMapViewOfSection(IN PVOID SectionObject,
|
||||
|
||||
ImageSectionObject->ImageSize = (ULONG)ImageSize;
|
||||
|
||||
/* Check for an illegal base address */
|
||||
if ((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress)
|
||||
{
|
||||
ImageBase = PAGE_ROUND_DOWN((ULONG_PTR)MmHighestUserAddress - ImageSize);
|
||||
}
|
||||
|
||||
/* Check there is enough space to map the section at that point. */
|
||||
if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase,
|
||||
PAGE_ROUND_UP(ImageSize)) != NULL)
|
||||
|
||||
Reference in New Issue
Block a user