[ros-diffs] [aandrejevic] 63580: [NTOS:MM] MmUnmapViewOfCacheSegment expects DeleteInProgress to be FALSE and the address space to be unlocked. Allow unmapping memory areas which belong to the cache.

[aandrejevic]

Author: aandrejevic
Date: Mon Jun  9 18:21:03 2014
New Revision: 63580

URL: http://svn.reactos.org/svn/reactos?rev=63580&view=rev
Log:
[NTOS:MM]
MmUnmapViewOfCacheSegment expects DeleteInProgress to be FALSE and the address 
space to be unlocked.
Allow unmapping memory areas which belong to the cache.


Modified:
    trunk/reactos/ntoskrnl/mm/section.c

Modified: trunk/reactos/ntoskrnl/mm/section.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=63580&r1=63579&r2=63580&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jun  9 18:21:03 2014
@@ -4090,14 +4090,21 @@
       return(STATUS_UNSUCCESSFUL);
    }
 
-   MemoryArea->DeleteInProgress = TRUE;
    Section = MemoryArea->Data.SectionData.Section;
    Segment = MemoryArea->Data.SectionData.Segment;
 
 #ifdef NEWCC
-   if (Segment->Flags & MM_DATAFILE_SEGMENT)
-      return MmUnmapViewOfCacheSegment(AddressSpace, BaseAddress);
+    if (Segment->Flags & MM_DATAFILE_SEGMENT)
+    {
+        MmUnlockAddressSpace(AddressSpace);
+        Status = MmUnmapViewOfCacheSegment(AddressSpace, BaseAddress);
+        MmLockAddressSpace(AddressSpace);
+
+        return Status;
+    }
 #endif
+
+   MemoryArea->DeleteInProgress = TRUE;
 
    MmLockSectionSegment(Segment);
 
@@ -4151,7 +4158,8 @@
    MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,
                                             BaseAddress);
    if (MemoryArea == NULL ||
-       MemoryArea->Type != MEMORY_AREA_SECTION_VIEW ||
+       ((MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) &&
+       (MemoryArea->Type != MEMORY_AREA_CACHE)) ||
        MemoryArea->DeleteInProgress)
    {
       if (MemoryArea) NT_ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3);
@@ -4159,11 +4167,9 @@
       return STATUS_NOT_MAPPED_VIEW;
    }
 
-   MemoryArea->DeleteInProgress = TRUE;
-
    Section = MemoryArea->Data.SectionData.Section;
 
-   if (Section->AllocationAttributes & SEC_IMAGE)
+   if ((Section != NULL) && (Section->AllocationAttributes & SEC_IMAGE))
    {
       ULONG i;
       ULONG NrSegments;
@@ -4175,6 +4181,8 @@
       ImageSectionObject = Section->ImageSection;
       SectionSegments = ImageSectionObject->Segments;
       NrSegments = ImageSectionObject->NrSegments;
+
+      MemoryArea->DeleteInProgress = TRUE;
 
       /* Search for the current segment within the section segments
        * and calculate the image base address */