Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:MM] Remove residual hack from commit 864a1bc6a (r55323).

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2022-10-27 01:05:57 +02:00
parent a0b1a01c59
commit 58983061e9
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ntoskrnl/mm/ARM3/section.c
View file

@ -135,24 +135,6 @@ MiIsProtectionCompatible(IN ULONG SectionPageProtection,
return ((CompatibleMask | NewSectionPageProtection) == CompatibleMask); return ((CompatibleMask | NewSectionPageProtection) == CompatibleMask);
} }
ACCESS_MASK
NTAPI
MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection)
{
ULONG ProtectionMask;
/* Calculate the protection mask and make sure it's valid */
ProtectionMask = MiMakeProtectionMask(SectionPageProtection);
if (ProtectionMask == MM_INVALID_PROTECTION)
{
DPRINT1("Invalid protection mask\n");
return STATUS_INVALID_PAGE_PROTECTION;
}
/* Now convert it to the required file access */
return MmMakeFileAccess[ProtectionMask & 0x7];
}
ULONG ULONG
NTAPI NTAPI
MiMakeProtectionMask(IN ULONG Protect) MiMakeProtectionMask(IN ULONG Protect)
@ -2521,11 +2503,16 @@ MmCreateArm3Section(OUT PVOID *SectionObject,
(SectionPageProtection & PAGE_NOACCESS))); (SectionPageProtection & PAGE_NOACCESS)));
/* Convert section flag to page flag */ /* Convert section flag to page flag */
if (AllocationAttributes & SEC_NOCACHE) SectionPageProtection |= PAGE_NOCACHE; if (AllocationAttributes & SEC_NOCACHE)
SectionPageProtection |= PAGE_NOCACHE;
/* Check to make sure the protection is correct. Nt* does this already */ /* Check to make sure the protection is correct. Nt* does this already */
ProtectionMask = MiMakeProtectionMask(SectionPageProtection); ProtectionMask = MiMakeProtectionMask(SectionPageProtection);
if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; if (ProtectionMask == MM_INVALID_PROTECTION)
{
DPRINT1("Invalid protection mask\n");
return STATUS_INVALID_PAGE_PROTECTION;
}
/* Check if this is going to be a data or image backed file section */ /* Check if this is going to be a data or image backed file section */
if ((FileHandle) || (FileObject)) if ((FileHandle) || (FileObject))

3
ntoskrnl/mm/section.c
View file

@ -220,8 +220,7 @@ static ULONG SectionCharacteristicsToProtect[16] =
PAGE_EXECUTE_READWRITE, /* 15 = WRITABLE, READABLE, EXECUTABLE, SHARED */ PAGE_EXECUTE_READWRITE, /* 15 = WRITABLE, READABLE, EXECUTABLE, SHARED */
}; };
extern ULONG MmMakeFileAccess []; extern ACCESS_MASK MmMakeFileAccess[8];
ACCESS_MASK NTAPI MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection);
static GENERIC_MAPPING MmpSectionMapping = static GENERIC_MAPPING MmpSectionMapping =
{ {
STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY,