Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[ion] 57224: [NTOSKRNL]: Missed the one ASSERT that mattered...

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 21:46:50 2012 New Revision: 57224 URL: http://svn.reactos.org/svn/reactos?rev=57224&view=rev Log: [NTOSKRNL]: Missed the one ASSERT that mattered... Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Sep 2 21:46:50 2012 @@ -1367,8 +1367,13 @@ /* On ARM3 pages, we should see a valid share count */ ASSERT((Pfn1->u2.ShareCount != 0) && (Pfn1->u3.e1.PageLocation == ActiveAndValid)); - /* We don't support mapping a prototype page yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && (Pfn1->OriginalPte.u.Soft.Prototype == 0)); + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* FIXME: We should charge commit */ + DPRINT1("Not charging commit for prototype PTE\n"); + } } /* More locked pages! */

12 years

[ion] 57223: [NTOSKRNL]: Warn, but do not ASSERT, about the fact that we don't have commit charges yet. Fixes OllyDbg2 assertions (and probably others too).

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 20:56:55 2012 New Revision: 57223 URL: http://svn.reactos.org/svn/reactos?rev=57223&view=rev Log: [NTOSKRNL]: Warn, but do not ASSERT, about the fact that we don't have commit charges yet. Fixes OllyDbg2 assertions (and probably others too). Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Sep 2 20:56:55 2012 @@ -94,8 +94,8 @@ #endif // -// Protection Bits part of the internal memory manager Protection Mask -// Taken from http://www.reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_ke… +// Protection Bits part of the internal memory manager Protection Mask, from: +// http://reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_kernel // and public assertions. // #define MM_ZERO_ACCESS 0 @@ -1263,8 +1263,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should return commit */ + DPRINT1("Not returning commit for prototype PTE\n"); } /* Update the counter */ @@ -1301,8 +1301,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should return commit */ + DPRINT1("Not returning commit for prototype PTE\n"); } /* Update the counter, and drop a reference the long way */ @@ -1407,8 +1407,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should charge commit */ + DPRINT1("Not charging commit for prototype PTE\n"); } /* More locked pages! */ @@ -1456,8 +1456,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should charge commit */ + DPRINT1("Not charging commit for prototype PTE\n"); } /* More locked pages! */

12 years

[ion] 57222: [NTOSKRNL]: No longer force PAGE_READWRITE for allocations. Seems Mm is now mature enough to handle this. Tried with some winetests and they look happier.

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 20:49:31 2012 New Revision: 57222 URL: http://svn.reactos.org/svn/reactos?rev=57222&view=rev Log: [NTOSKRNL]: No longer force PAGE_READWRITE for allocations. Seems Mm is now mature enough to handle this. Tried with some winetests and they look happier. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Sep 2 20:49:31 2012 @@ -81,6 +81,29 @@ (CHAR)MM_INVALID_PROTECTION }; +ULONG MmCompatibleProtectionMask[8] = +{ + PAGE_NOACCESS, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, + + PAGE_NOACCESS | PAGE_EXECUTE, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | + PAGE_EXECUTE_READ, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE | + PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | + PAGE_EXECUTE_WRITECOPY, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | + PAGE_EXECUTE_READ | PAGE_EXECUTE_WRITECOPY +}; + MMSESSION MmSession; KGUARDED_MUTEX MmSectionCommitMutex; MM_AVL_TABLE MmSectionBasedRoot; @@ -88,6 +111,29 @@ PVOID MmHighSectionBase; /* PRIVATE FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +MiIsProtectionCompatible(IN ULONG SectionPageProtection, + IN ULONG NewSectionPageProtection) +{ + ULONG ProtectionMask, CompatibleMask; + + /* Calculate the protection mask and make sure it's valid */ + ProtectionMask = MiMakeProtectionMask(SectionPageProtection); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return FALSE; + } + + /* Calculate the compatible mask */ + CompatibleMask = MmCompatibleProtectionMask[ProtectionMask & 0x7] | + PAGE_GUARD | PAGE_NOCACHE | PAGE_WRITECOMBINE; + + /* See if the mapping protection is compatible with the create protection */ + return ((CompatibleMask | NewSectionPageProtection) == CompatibleMask); +} ACCESS_MASK NTAPI @@ -2424,9 +2470,6 @@ NTSTATUS Status; PAGED_CODE(); - /* Force PAGE_READWRITE for everything, for now */ - Protect = PAGE_READWRITE; - /* Get the segment and control area */ Section = (PSECTION)SectionObject; ControlArea = Section->Segment->ControlArea; @@ -2438,14 +2481,12 @@ ASSERT((AllocationType & MEM_RESERVE) == 0); ASSERT(ControlArea->u.Flags.PhysicalMemory == 0); -#if 0 - /* FIXME: Check if the mapping protection is compatible with the create */ + /* Check if the mapping protection is compatible with the create */ if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect)) { DPRINT1("Mapping protection is incompatible\n"); return STATUS_SECTION_PROTECTION; } -#endif /* Check if the offset and size would cause an overflow */ if (((ULONG64)SectionOffset->QuadPart + *ViewSize) < Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 2 20:49:31 2012 @@ -3738,11 +3738,6 @@ return STATUS_INVALID_PARAMETER_6; } } - - // - // Force PAGE_READWRITE for everything, for now - // - Protect = PAGE_READWRITE; /* Calculate the protection mask and make sure it's valid */ ProtectionMask = MiMakeProtectionMask(Protect); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Sep 2 20:49:31 2012 @@ -4986,7 +4986,11 @@ #endif else { - ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY); + if ((AllocationAttributes & SEC_PHYSICALMEMORY) == 0) + { + DPRINT1("Invalid path: %lx %p %p\n", AllocationAttributes, FileObject, FileHandle); + } +// ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY); Status = MmCreatePageFileSection(SectionObject, DesiredAccess, ObjectAttributes,

12 years

[ion] 57221: [NTOSKRNL]: Implement MiCheckSecuredVad and stop whining about not supporting SEC_NO_CHANGE, cleaning up the log. [NTOSKRNL]: Kill a bunch of now-useless DPRINT1s in Mm, significantly ...

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 18:54:05 2012 New Revision: 57221 URL: http://svn.reactos.org/svn/reactos?rev=57221&view=rev Log: [NTOSKRNL]: Implement MiCheckSecuredVad and stop whining about not supporting SEC_NO_CHANGE, cleaning up the log. [NTOSKRNL]: Kill a bunch of now-useless DPRINT1s in Mm, significantly cleaning up the log. [HIVES/MSI]: .NET needs InstallRoot, not InstallDir. Kills millions of DPRINT1s, thus cleaning up the log. Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -30,7 +30,7 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll" ; .NET -HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallDir",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" +HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallRoot",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -19,7 +19,7 @@ HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" ; .NET -HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallDir",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" +HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallRoot",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" ; HTML Help HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -307,6 +307,13 @@ #define MI_SESSION_DATA_PAGES_MAXIMUM (MM_ALLOCATION_GRANULARITY / PAGE_SIZE) #define MI_SESSION_TAG_PAGES_MAXIMUM (MM_ALLOCATION_GRANULARITY / PAGE_SIZE) +// +// Used by MiCheckSecuredVad +// +#define MM_READ_WRITE_ALLOWED 11 +#define MM_READ_ONLY_ALLOWED 10 +#define MM_NO_ACCESS_ALLOWED 01 +#define MM_DELETE_CHECK 85 // // System views are binned into 64K chunks @@ -1867,6 +1874,15 @@ OUT PULONG_PTR Base ); +NTSTATUS +NTAPI +MiCheckSecuredVad( + IN PMMVAD Vad, + IN PVOID Base, + IN SIZE_T Size, + IN ULONG ProtectionMask +); + VOID NTAPI MiInsertVad( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -982,7 +982,7 @@ { /* This is a standby page, bring it back from the cache */ PageFrameIndex = TempPte.u.Trans.PageFrameNumber; - DPRINT1("oooh, shiny, a soft fault! 0x%lx\n", PageFrameIndex); + DPRINT("oooh, shiny, a soft fault! 0x%lx\n", PageFrameIndex); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -850,7 +850,7 @@ if (ListHead == &MmModifiedPageListHead) { /* For now, only single-prototype pages should end up in this path */ - DPRINT1("Modified page being added: %lx\n", PageFrameIndex); + DPRINT("Modified page being added: %lx\n", PageFrameIndex); ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); /* Modified pages are colored when they are selected for page file */ @@ -1259,7 +1259,7 @@ TempPte.u.Soft.Prototype = 0; TempPte.u.Soft.Protection = Pfn1->OriginalPte.u.Soft.Protection; MI_WRITE_INVALID_PTE(PointerPte, TempPte); - DPRINT1("Marking PTE: %p as transition (%p - %lx)\n", PointerPte, Pfn1, MiGetPfnEntryIndex(Pfn1)); + DPRINT("Marking PTE: %p as transition (%p - %lx)\n", PointerPte, Pfn1, MiGetPfnEntryIndex(Pfn1)); } /* Put the page in transition */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -771,7 +771,18 @@ /* For SEC_NO_CHANGE sections, we need some extra checks */ if (Vad->u.VadFlags.NoChange == 1) { - DPRINT1("Unmapping SEC_NO_CHANGE. Should validate if allowed!\n"); + /* Are we allowed to mess with this VAD? */ + Status = MiCheckSecuredVad(Vad, + (PVOID)(Vad->StartingVpn >> PAGE_SHIFT), + RegionSize, + MM_DELETE_CHECK); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + DPRINT1("Trying to unmap protected VAD!\n"); + if (!Flags) MmUnlockAddressSpace(&Process->Vm); + goto Quickie; + } } /* Not currently supported */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -19,6 +19,27 @@ /* Include Mm version of AVL support */ #include "../ARM3/miavl.h" #include "../../../lib/rtl/avlsupp.c" + +/* GLOBALS ********************************************************************/ + +CHAR MmReadWrite[32] = +{ + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, + MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, +}; /* FUNCTIONS ******************************************************************/ @@ -583,4 +604,69 @@ return STATUS_NO_MEMORY; } +NTSTATUS +NTAPI +MiCheckSecuredVad(IN PMMVAD Vad, + IN PVOID Base, + IN SIZE_T Size, + IN ULONG ProtectionMask) +{ + ULONG_PTR StartAddress, EndAddress; + + /* Compute start and end address */ + StartAddress = (ULONG_PTR)Base; + EndAddress = StartAddress + Size - 1; + + /* Are we deleting/unmapping, or changing? */ + if (ProtectionMask < MM_DELETE_CHECK) + { + /* Changing... are we allowed to do so? */ + if ((Vad->u.VadFlags.NoChange == 1) && + (Vad->u2.VadFlags2.SecNoChange == 1) && + (Vad->u.VadFlags.Protection != ProtectionMask)) + { + /* Nope, bail out */ + DPRINT1("Trying to mess with a no-change VAD!\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + } + else + { + /* This is allowed */ + ProtectionMask = 0; + } + + /* ARM3 doesn't support this yet */ + ASSERT(Vad->u2.VadFlags2.MultipleSecured == 0); + + /* Is this a one-secured VAD, like a TEB or PEB? */ + if (Vad->u2.VadFlags2.OneSecured) + { + /* Is this allocation being described by the VAD? */ + if ((StartAddress <= ((PMMVAD_LONG)Vad)->u3.Secured.EndVpn) && + (EndAddress >= ((PMMVAD_LONG)Vad)->u3.Secured.StartVpn)) + { + /* Guard page? */ + if (ProtectionMask && MM_DECOMMIT) + { + DPRINT1("Not allowed to change protection on guard page!\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* ARM3 doesn't have read-only VADs yet */ + ASSERT(Vad->u2.VadFlags2.ReadOnly == 0); + + /* Check if read-write protections are allowed */ + if (MmReadWrite[ProtectionMask] < MM_READ_WRITE_ALLOWED) + { + DPRINT1("Invalid protection mask for RW access!\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + } + } + + /* All good, allow the change */ + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 2 18:54:05 2012 @@ -4132,11 +4132,23 @@ } // - // We should make sure that the section's permissions aren't being messed with + // We should make sure that the section's permissions aren't being + // messed with // if (FoundVad->u.VadFlags.NoChange) { - DPRINT1("SEC_NO_CHANGE section being touched. Assuming this is ok\n"); + // + // Make sure it's okay to touch it + // + Status = MiCheckSecuredVad(FoundVad, + PBaseAddress, + PRegionSize, + ProtectionMask); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Secured VAD being messed around with\n"); + goto FailPath; + } } //

12 years

[ion] 57220: [NTOSKRNL]: Restore the protect hack, maybe it's not as no-op as it seems.

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 18:03:14 2012 New Revision: 57220 URL: http://svn.reactos.org/svn/reactos?rev=57220&view=rev Log: [NTOSKRNL]: Restore the protect hack, maybe it's not as no-op as it seems. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 2 18:03:14 2012 @@ -1827,6 +1827,46 @@ NTSTATUS NTAPI +MiRosProtectVirtualMemory(IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG OldAccessProtection OPTIONAL) +{ + PMEMORY_AREA MemoryArea; + PMMSUPPORT AddressSpace; + ULONG OldAccessProtection_; + NTSTATUS Status; + + *NumberOfBytesToProtect = PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - PAGE_ROUND_DOWN(*BaseAddress); + *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); + + AddressSpace = &Process->Vm; + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); + if (MemoryArea == NULL || MemoryArea->DeleteInProgress) + { + MmUnlockAddressSpace(AddressSpace); + return STATUS_UNSUCCESSFUL; + } + + if (OldAccessProtection == NULL) OldAccessProtection = &OldAccessProtection_; + + ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW); + Status = MmProtectSectionView(AddressSpace, + MemoryArea, + *BaseAddress, + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); + + MmUnlockAddressSpace(AddressSpace); + + return Status; +} + +NTSTATUS +NTAPI MiProtectVirtualMemory(IN PEPROCESS Process, IN OUT PVOID *BaseAddress, IN OUT PSIZE_T NumberOfBytesToProtect, @@ -1856,6 +1896,18 @@ DPRINT1("Invalid protection mask\n"); return STATUS_INVALID_PAGE_PROTECTION; } + + /* Check for ROS specific memory area */ + MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); + if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) + { + /* Evil hack */ + return MiRosProtectVirtualMemory(Process, + BaseAddress, + NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); + } /* Lock the address space and make sure the process isn't already dead */ AddressSpace = MmGetCurrentAddressSpace(); @@ -1902,15 +1954,6 @@ DPRINT1("Trying to change protection of a NoChange VAD\n"); Status = STATUS_INVALID_PAGE_PROTECTION; goto FailPath; - } - - /* Check for ROS specific memory area */ - MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); - if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) - { - /* Empirical evidence suggests this is only used in one critical scenario and is always a no-op */ - OldProtect = NewAccessProtection; - goto RosReturn; } /* Is this section, or private memory? */ @@ -2064,7 +2107,7 @@ /* Unlock the working set */ //MiUnlockProcessWorkingSet(Thread, Process); } -RosReturn: + /* Unlock the address space */ MmUnlockAddressSpace(AddressSpace); @@ -3809,7 +3852,7 @@ Status = STATUS_INVALID_PARAMETER; goto FailPathNoLock; } - if ((AllocationType & MEM_PHYSICAL) ==MEM_PHYSICAL) + if ((AllocationType & MEM_PHYSICAL) == MEM_PHYSICAL) { DPRINT1("MEM_PHYSICAL not supported\n"); Status = STATUS_INVALID_PARAMETER;

12 years

[mnordell] 57219: Comment-fix. Get/Set flip.

by mnordell＠svn.reactos.org

Author: mnordell Date: Sun Sep 2 15:33:32 2012 New Revision: 57219 URL: http://svn.reactos.org/svn/reactos?rev=57219&view=rev Log: Comment-fix. Get/Set flip. Modified: trunk/reactos/ntoskrnl/ps/i386/psctx.c Modified: trunk/reactos/ntoskrnl/ps/i386/psctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/i386/psctx.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ps/i386/psctx.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/i386/psctx.c [iso-8859-1] Sun Sep 2 15:33:32 2012 @@ -75,12 +75,12 @@ /* Check if it's a set or get */ if (Apc->SystemArgument1) { - /* Get the Context */ + /* Set the Context */ PspSetContext(TrapFrame, NULL, Context, Mode); } else { - /* Set the Context */ + /* Get the Context */ PspGetContext(TrapFrame, NULL, Context); }

12 years

[ion] 57218: [NTOSKRNL]: Remove another useless ASSERT.

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 08:21:18 2012 New Revision: 57218 URL: http://svn.reactos.org/svn/reactos?rev=57218&view=rev Log: [NTOSKRNL]: Remove another useless ASSERT. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Sep 2 08:21:18 2012 @@ -1837,7 +1837,6 @@ Vad); /* Return the status */ - ASSERT(NT_SUCCESS(Status)); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); return Status;

12 years

[ion] 57217: [NTOSKRNL]: Fix stupid checks

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 08:17:58 2012 New Revision: 57217 URL: http://svn.reactos.org/svn/reactos?rev=57217&view=rev Log: [NTOSKRNL]: Fix stupid checks Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 2 08:17:58 2012 @@ -3803,31 +3803,31 @@ Status = STATUS_INVALID_PARAMETER; goto FailPathNoLock; } - if ((AllocationType & MEM_LARGE_PAGES) == 1) + if ((AllocationType & MEM_LARGE_PAGES) == MEM_LARGE_PAGES) { DPRINT1("MEM_LARGE_PAGES not supported\n"); Status = STATUS_INVALID_PARAMETER; goto FailPathNoLock; } - if ((AllocationType & MEM_PHYSICAL) == 1) + if ((AllocationType & MEM_PHYSICAL) ==MEM_PHYSICAL) { DPRINT1("MEM_PHYSICAL not supported\n"); Status = STATUS_INVALID_PARAMETER; goto FailPathNoLock; } - if ((AllocationType & MEM_WRITE_WATCH) == 1) + if ((AllocationType & MEM_WRITE_WATCH) == MEM_WRITE_WATCH) { DPRINT1("MEM_WRITE_WATCH not supported\n"); Status = STATUS_INVALID_PARAMETER; goto FailPathNoLock; } - if ((AllocationType & MEM_TOP_DOWN) == 1) + if ((AllocationType & MEM_TOP_DOWN) == MEM_TOP_DOWN) { DPRINT1("MEM_TOP_DOWN not supported\n"); Status = STATUS_INVALID_PARAMETER; goto FailPathNoLock; } - if ((AllocationType & MEM_RESET) == 1) + if ((AllocationType & MEM_RESET) == MEM_RESET) { DPRINT1("MEM_RESET not supported\n"); Status = STATUS_INVALID_PARAMETER;

12 years

[ion] 57216: [NTOSKRNL]: Kill not-needed assertion.

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 08:13:24 2012 New Revision: 57216 URL: http://svn.reactos.org/svn/reactos?rev=57216&view=rev Log: [NTOSKRNL]: Kill not-needed assertion. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Sep 2 08:13:24 2012 @@ -1085,7 +1085,9 @@ Process, LockIrql, TrapInformation); - ASSERT(Status == STATUS_SUCCESS); + //ASSERT(Status != STATUS_ISSUE_PAGING_IO); + //ASSERT(Status != STATUS_REFAULT); + //ASSERT(Status != STATUS_PTE_CHANGED); /* Did the routine clean out the PFN or should we? */ if (OutPfn)

12 years

[ion] 57215: [NTOSKRNL]: Do not return data in failure cases in NtProtectVirtualMemory. [NTOSKRNL]: No longer support non-ARM3 sections in NtProtectVirtualMemory, as the only OS calls were already ...

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 2 01:17:42 2012 New Revision: 57215 URL: http://svn.reactos.org/svn/reactos?rev=57215&view=rev Log: [NTOSKRNL]: Do not return data in failure cases in NtProtectVirtualMemory. [NTOSKRNL]: No longer support non-ARM3 sections in NtProtectVirtualMemory, as the only OS calls were already NO-OPS. [NTOSKRNL]: Always use ARM3 sections unless SEC_PHYSICAL_MEMORY is used, and make the check explicit. [NTOSKRNL]: No longer support allocating memory on top of non-ARM3 sections. [NTOSKRNL]: No longer ASSERT when certain features are not yet implemented, instead return an error code. [NTOSKRNL]: Add another check in NtFreevirtualMemory when invalid memory is being freed, insert of ASSERTing. [NTOSKRNL]: Implement and use MiIsEntireRangeCommitted when protecting memory to make sure the entire range is committed. This patch removes multiple hacks, ASSERTs, and evil mixing of ARM3 and non-ARM3 code/memory. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Sep 2 01:17:42 2012 @@ -2009,20 +2009,6 @@ NTSTATUS NTAPI -MiRosAllocateVirtualMemory( - IN HANDLE ProcessHandle, - IN PEPROCESS Process, - IN PMEMORY_AREA MemoryArea, - IN PMMSUPPORT AddressSpace, - IN OUT PVOID* UBaseAddress, - IN BOOLEAN Attached, - IN OUT PSIZE_T URegionSize, - IN ULONG AllocationType, - IN ULONG Protect -); - -NTSTATUS -NTAPI MiRosUnmapViewInSystemSpace( IN PVOID MappedBase ); Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Sep 2 01:17:42 2012 @@ -2217,7 +2217,6 @@ /* Yep, use the entered size */ Section.SizeOfSection.QuadPart = InputMaximumSize->QuadPart; } - } else { Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 2 01:17:42 2012 @@ -1749,6 +1749,82 @@ return Status; } +ULONG +NTAPI +MiIsEntireRangeCommitted(IN ULONG_PTR StartingAddress, + IN ULONG_PTR EndingAddress, + IN PMMVAD Vad, + IN PEPROCESS Process) +{ + PMMPTE PointerPte, LastPte, PointerPde; + BOOLEAN OnBoundary = TRUE; + PAGED_CODE(); + + /* Get the PDE and PTE addresses */ + PointerPde = MiAddressToPde(StartingAddress); + PointerPte = MiAddressToPte(StartingAddress); + LastPte = MiAddressToPte(EndingAddress); + + /* Loop all the PTEs */ + while (PointerPte <= LastPte) + { + /* Check if we've hit an new PDE boundary */ + if (OnBoundary) + { + /* Is this PDE demand zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't -- is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Nope, fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* The PTE was already valid, so move to the next one */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + + /* Is the entire VAD committed? If not, fail */ + if (!Vad->u.VadFlags.MemCommit) return FALSE; + + /* Everything is committed so far past the range, return true */ + if (PointerPte > LastPte) return TRUE; + } + } + + /* Is the PTE demand zero? */ + if (PointerPte->u.Long == 0) + { + /* Is the entire VAD committed? If not, fail */ + if (!Vad->u.VadFlags.MemCommit) return FALSE; + } + else + { + /* It isn't -- is it a decommited, invalid, or faulted PTE? */ + if ((PointerPte->u.Soft.Protection == MM_DECOMMIT) && + (PointerPte->u.Hard.Valid == 0) && + ((PointerPte->u.Soft.Prototype == 0) || + (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) + { + /* Then part of the range is decommitted, so fail */ + return FALSE; + } + } + + /* Move to the next PTE */ + PointerPte++; + OnBoundary = MiIsPteOnPdeBoundary(PointerPte); + } + + /* All PTEs seem valid, and no VAD checks failed, the range is okay */ + return TRUE; +} + NTSTATUS NTAPI MiProtectVirtualMemory(IN PEPROCESS Process, @@ -1765,19 +1841,9 @@ MMPTE PteContents; //PUSHORT UsedPageTableEntries; PMMPFN Pfn1; - ULONG ProtectionMask; + ULONG ProtectionMask, OldProtect; + BOOLEAN Committed; NTSTATUS Status = STATUS_SUCCESS; - - /* Check for ROS specific memory area */ - MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); - if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) - { - return MiRosProtectVirtualMemory(Process, - BaseAddress, - NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); - } /* Calcualte base address for the VAD */ StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); @@ -1838,10 +1904,53 @@ goto FailPath; } + /* Check for ROS specific memory area */ + MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); + if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) + { + /* Empirical evidence suggests this is only used in one critical scenario and is always a no-op */ + OldProtect = NewAccessProtection; + goto RosReturn; + } + + /* Is this section, or private memory? */ if (Vad->u.VadFlags.PrivateMemory == 0) { - /* This is a section, handled by the ROS specific code above */ - UNIMPLEMENTED; + /* Not yet supported */ + if (Vad->u.VadFlags.VadType == VadLargePageSection) + { + DPRINT1("Illegal VAD for attempting to set protection\n"); + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + + /* Rotate VADs are not yet supported */ + if (Vad->u.VadFlags.VadType == VadRotatePhysical) + { + DPRINT1("Illegal VAD for attempting to set protection\n"); + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + + /* Not valid on section files */ + if (NewAccessProtection & (PAGE_NOCACHE | PAGE_WRITECOMBINE)) + { + /* Fail */ + DPRINT1("Invalid protection flags for section\n"); + Status = STATUS_INVALID_PARAMETER_4; + goto FailPath; + } + + /* Check if data or page file mapping protection PTE is compatible */ + if (!Vad->ControlArea->u.Flags.Image) + { + /* Not yet */ + DPRINT1("Fixme: Not checking for valid protection\n"); + } + + /* This is a section, and this is not yet supported */ + DPRINT1("Section protection not yet supported\n"); + OldProtect = 0; } else { @@ -1849,13 +1958,26 @@ if ((NewAccessProtection & PAGE_WRITECOPY) || (NewAccessProtection & PAGE_EXECUTE_WRITECOPY)) { + DPRINT1("Invalid protection flags for private memory\n"); Status = STATUS_INVALID_PARAMETER_4; goto FailPath; } //MiLockProcessWorkingSet(Thread, Process); - /* TODO: Check if all pages in this range are committed */ + /* Check if all pages in this range are committed */ + Committed = MiIsEntireRangeCommitted(StartingAddress, + EndingAddress, + Vad, + Process); + if (!Committed) + { + /* Fail */ + DPRINT1("The entire range is not committed\n"); + Status = STATUS_NOT_COMMITTED; + //MiUnlockProcessWorkingSet(Thread, Process); + goto FailPath; + } /* Compute starting and ending PTE and PDE addresses */ PointerPde = MiAddressToPde(StartingAddress); @@ -1869,13 +1991,13 @@ if (PointerPte->u.Long != 0) { /* Capture the page protection and make the PDE valid */ - *OldAccessProtection = MiGetPageProtection(PointerPte); + OldProtect = MiGetPageProtection(PointerPte); MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); } else { /* Grab the old protection from the VAD itself */ - *OldAccessProtection = MmProtectToValue[Vad->u.VadFlags.Protection]; + OldProtect = MmProtectToValue[Vad->u.VadFlags.Protection]; } /* Loop all the PTEs now */ @@ -1911,19 +2033,18 @@ if ((NewAccessProtection & PAGE_NOACCESS) || (NewAccessProtection & PAGE_GUARD)) { - /* TODO */ + /* The page should be in the WS and we should make it transition now */ UNIMPLEMENTED; + //continue; } - else - { - /* Write the protection mask and write it with a TLB flush */ - Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; - MiFlushTbAndCapture(Vad, - PointerPte, - ProtectionMask, - Pfn1, - TRUE); - } + + /* Write the protection mask and write it with a TLB flush */ + Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; + MiFlushTbAndCapture(Vad, + PointerPte, + ProtectionMask, + Pfn1, + TRUE); } else { @@ -1933,23 +2054,29 @@ /* The PTE is already demand-zero, just update the protection mask */ PointerPte->u.Soft.Protection = ProtectionMask; - } - + ASSERT(PointerPte->u.Long != 0); + } + + /* Move to the next PTE */ PointerPte++; } - /* Unlock the working set and update quota charges if needed, then return */ + /* Unlock the working set */ //MiUnlockProcessWorkingSet(Thread, Process); } - -FailPath: +RosReturn: /* Unlock the address space */ MmUnlockAddressSpace(AddressSpace); - /* Return parameters */ - *NumberOfBytesToProtect = (SIZE_T)((PUCHAR)EndingAddress - (PUCHAR)StartingAddress + 1); + /* Return parameters and success */ + *NumberOfBytesToProtect = EndingAddress - StartingAddress + 1; *BaseAddress = (PVOID)StartingAddress; - + *OldAccessProtection = OldProtect; + return STATUS_SUCCESS; + +FailPath: + /* Unlock the address space and return the failure code */ + MmUnlockAddressSpace(AddressSpace); return Status; } @@ -3668,15 +3795,50 @@ } // - // Assert on the things we don't yet support - // - ASSERT(ZeroBits == 0); - ASSERT((AllocationType & MEM_LARGE_PAGES) == 0); - ASSERT((AllocationType & MEM_PHYSICAL) == 0); - ASSERT((AllocationType & MEM_WRITE_WATCH) == 0); - ASSERT((AllocationType & MEM_TOP_DOWN) == 0); - ASSERT((AllocationType & MEM_RESET) == 0); - ASSERT(Process->VmTopDown == 0); + // Fail on the things we don't yet support + // + if (ZeroBits != 0) + { + DPRINT1("Zero bits not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } + if ((AllocationType & MEM_LARGE_PAGES) == 1) + { + DPRINT1("MEM_LARGE_PAGES not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } + if ((AllocationType & MEM_PHYSICAL) == 1) + { + DPRINT1("MEM_PHYSICAL not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } + if ((AllocationType & MEM_WRITE_WATCH) == 1) + { + DPRINT1("MEM_WRITE_WATCH not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } + if ((AllocationType & MEM_TOP_DOWN) == 1) + { + DPRINT1("MEM_TOP_DOWN not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } + if ((AllocationType & MEM_RESET) == 1) + { + DPRINT1("MEM_RESET not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } + if (Process->VmTopDown == 1) + { + DPRINT1("VmTopDown not supported\n"); + Status = STATUS_INVALID_PARAMETER; + goto FailPathNoLock; + } // // Check if the caller is reserving memory, or committing memory and letting @@ -3895,24 +4057,10 @@ } // - // If this is an existing section view, we call the old RosMm routine which - // has the relevant code required to handle the section scenario. In the future - // we will limit this even more so that there's almost nothing that the code - // needs to do, and it will become part of section.c in RosMm + // Make sure this is an ARM3 section // MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)PAGE_ROUND_DOWN(PBaseAddress)); - if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3) - { - return MiRosAllocateVirtualMemory(ProcessHandle, - Process, - MemoryArea, - AddressSpace, - UBaseAddress, - Attached, - URegionSize, - AllocationType, - Protect); - } + ASSERT(MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3); // Is this a previously reserved section being committed? If so, enter the // special section path @@ -4324,12 +4472,21 @@ } // - // These ASSERTs are here because ReactOS ARM3 does not currently implement - // any other kinds of VADs. - // - ASSERT(Vad->u.VadFlags.PrivateMemory == 1); + // Only private memory (except rotate VADs) can be freed through here */ + // + if ((!(Vad->u.VadFlags.PrivateMemory) && + (Vad->u.VadFlags.VadType != VadRotatePhysical)) || + (Vad->u.VadFlags.VadType == VadDevicePhysicalMemory)) + { + DPRINT1("Attempt to free section memory\n"); + Status = STATUS_UNABLE_TO_DELETE_SECTION; + goto FailPath; + } + + // + // ARM3 does not yet handle protected VM + // ASSERT(Vad->u.VadFlags.NoChange == 0); - ASSERT(Vad->u.VadFlags.VadType == VadNone); // // Finally, make sure there is a ReactOS Mm MEMORY_AREA for this allocation @@ -4345,6 +4502,11 @@ // if (FreeType & MEM_RELEASE) { + // + // ARM3 only supports this VAD in this path + // + ASSERT(Vad->u.VadFlags.VadType == VadNone); + // // Is the caller trying to remove the whole VAD, or remove only a portion // of it? If no region size is specified, then the assumption is that the Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Sep 2 01:17:42 2012 @@ -2716,7 +2716,7 @@ &Obj, &SectionSize, PAGE_EXECUTE_READWRITE, - 0, + SEC_PHYSICALMEMORY, NULL, NULL); if (!NT_SUCCESS(Status)) @@ -4860,7 +4860,7 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ - if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes)) + if (!(AllocationAttributes & (SEC_IMAGE | SEC_PHYSICALMEMORY))) { if (!(FileObject) && !(FileHandle)) { @@ -4986,6 +4986,7 @@ #endif else { + ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY); Status = MmCreatePageFileSection(SectionObject, DesiredAccess, ObjectAttributes, @@ -4997,133 +4998,4 @@ return Status; } -VOID -MmModifyAttributes(IN PMMSUPPORT AddressSpace, - IN PVOID BaseAddress, - IN SIZE_T RegionSize, - IN ULONG OldType, - IN ULONG OldProtect, - IN ULONG NewType, - IN ULONG NewProtect) -{ - // - // This function is deprecated but remains in order to support VirtualAlloc - // calls with MEM_COMMIT on top of MapViewOfFile calls with SEC_RESERVE. - // - // Win32k's shared user heap, for example, uses that mechanism. The two - // conditions when this function needs to do something are ASSERTed for, - // because they should not arise. - // - if (NewType == MEM_RESERVE && OldType == MEM_COMMIT) - { - ASSERT(FALSE); - } - - if ((NewType == MEM_COMMIT) && (OldType == MEM_COMMIT)) - { - ASSERT(OldProtect == NewProtect); - } -} - -NTSTATUS -NTAPI -MiRosAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN PEPROCESS Process, - IN PMEMORY_AREA MemoryArea, - IN PMMSUPPORT AddressSpace, - IN OUT PVOID* UBaseAddress, - IN BOOLEAN Attached, - IN OUT PSIZE_T URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) -{ - ULONG_PTR PRegionSize; - ULONG Type, RegionSize; - NTSTATUS Status; - PVOID PBaseAddress, BaseAddress; - KAPC_STATE ApcState; - - PBaseAddress = *UBaseAddress; - PRegionSize = *URegionSize; - - BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); - RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - - PAGE_ROUND_DOWN(PBaseAddress); - Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; - - ASSERT(PBaseAddress != 0); - ASSERT(Type == MEM_COMMIT); - ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW); - ASSERT(((ULONG_PTR)BaseAddress + RegionSize) <= (ULONG_PTR)MemoryArea->EndingAddress); - ASSERT(((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress) >= RegionSize); - ASSERT(MemoryArea->Data.SectionData.RegionListHead.Flink); - - Status = MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, - RegionSize, - Type, - Protect, - MmModifyAttributes); - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - if (NT_SUCCESS(Status)) - { - *UBaseAddress = BaseAddress; - *URegionSize = RegionSize; - } - - return Status; -} - -NTSTATUS -NTAPI -MiRosProtectVirtualMemory(IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG OldAccessProtection OPTIONAL) -{ - PMEMORY_AREA MemoryArea; - PMMSUPPORT AddressSpace; - ULONG OldAccessProtection_; - NTSTATUS Status; - - *NumberOfBytesToProtect = PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - PAGE_ROUND_DOWN(*BaseAddress); - *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - - AddressSpace = &Process->Vm; - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); - if (MemoryArea == NULL || MemoryArea->DeleteInProgress) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_UNSUCCESSFUL; - } - - if (OldAccessProtection == NULL) OldAccessProtection = &OldAccessProtection_; - - if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Status = MmProtectSectionView(AddressSpace, - MemoryArea, - *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); - } - else - { - /* FIXME: Should we return failure or success in this case? */ - Status = STATUS_CONFLICTING_ADDRESSES; - } - - MmUnlockAddressSpace(AddressSpace); - - return Status; -} - /* EOF */

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2012