Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [NTOSKRNL] Rename PagingFileList to MmPagingFile and make insertion simpler
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f106c297de749667b7818… commit f106c297de749667b7818c4ec9a38b51b9c7c801 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 23:19:58 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:19:58 2018 +0200 [NTOSKRNL] Rename PagingFileList to MmPagingFile and make insertion simpler --- ntoskrnl/mm/pagefile.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 4e6679bcbe..cbc7c9a854 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -58,7 +58,7 @@ PAGINGFILE, *PPAGINGFILE; #define MAX_PAGING_FILES (16) /* List of paging files, both used and free */ -static PPAGINGFILE PagingFileList[MAX_PAGING_FILES]; +static PPAGINGFILE MmPagingFile[MAX_PAGING_FILES]; /* Lock for examining the list of paging files */ static KSPIN_LOCK PagingFileListLock; @@ -129,7 +129,7 @@ MmIsFileObjectAPagingFile(PFILE_OBJECT FileObject) for (i = 0; i < MmNumberOfPagingFiles; i++) { /* Check if this is one of them */ - if (PagingFileList[i]->FileObject == FileObject) return TRUE; + if (MmPagingFile[i]->FileObject == FileObject) return TRUE; } /* Nothing found */ @@ -171,8 +171,8 @@ MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) i = FILE_FROM_ENTRY(SwapEntry); offset = OFFSET_FROM_ENTRY(SwapEntry) - 1; - if (PagingFileList[i]->FileObject == NULL || - PagingFileList[i]->FileObject->DeviceObject == NULL) + if (MmPagingFile[i]->FileObject == NULL || + MmPagingFile[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); KeBugCheck(MEMORY_MANAGEMENT); @@ -185,7 +185,7 @@ MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) file_offset.QuadPart = offset * PAGE_SIZE; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(PagingFileList[i]->FileObject, + Status = IoSynchronousPageWrite(MmPagingFile[i]->FileObject, Mdl, &file_offset, &Event, @@ -236,7 +236,7 @@ MiReadPageFile( ASSERT(PageFileIndex < MAX_PAGING_FILES); - PagingFile = PagingFileList[PageFileIndex]; + PagingFile = MmPagingFile[PageFileIndex]; if (PagingFile->FileObject == NULL || PagingFile->FileObject->DeviceObject == NULL) { @@ -283,7 +283,7 @@ MmInitPagingFile(VOID) for (i = 0; i < MAX_PAGING_FILES; i++) { - PagingFileList[i] = NULL; + MmPagingFile[i] = NULL; } MmNumberOfPagingFiles = 0; } @@ -308,26 +308,29 @@ MmFreeSwapPage(SWAPENTRY Entry) ULONG i; ULONG_PTR off; KIRQL oldIrql; + PPAGINGFILE PagingFile; i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry) - 1; KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - if (PagingFileList[i] == NULL) + + PagingFile = MmPagingFile[i]; + if (PagingFile == NULL) { KeBugCheck(MEMORY_MANAGEMENT); } - KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); + KeAcquireSpinLockAtDpcLevel(&PagingFile->AllocMapLock); - RtlClearBit(PagingFileList[i]->AllocMap, off >> 5); + RtlClearBit(PagingFile->AllocMap, off >> 5); - PagingFileList[i]->FreePages++; - PagingFileList[i]->UsedPages--; + PagingFile->FreePages++; + PagingFile->UsedPages--; MiFreeSwapPages++; MiUsedSwapPages--; - KeReleaseSpinLockFromDpcLevel(&PagingFileList[i]->AllocMapLock); + KeReleaseSpinLockFromDpcLevel(&PagingFile->AllocMapLock); KeReleaseSpinLock(&PagingFileListLock, oldIrql); } @@ -350,10 +353,10 @@ MmAllocSwapPage(VOID) for (i = 0; i < MAX_PAGING_FILES; i++) { - if (PagingFileList[i] != NULL && - PagingFileList[i]->FreePages >= 1) + if (MmPagingFile[i] != NULL && + MmPagingFile[i]->FreePages >= 1) { - off = MiAllocPageFromPagingFile(PagingFileList[i]); + off = MiAllocPageFromPagingFile(MmPagingFile[i]); if (off == 0xFFFFFFFF) { KeBugCheck(MEMORY_MANAGEMENT); @@ -388,7 +391,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PPAGINGFILE PagingFile; KIRQL oldIrql; ULONG AllocMapSize; - ULONG i; ULONG Count; KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedFileName; @@ -660,16 +662,9 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, RtlClearAllBits(PagingFile->AllocMap); KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - for (i = 0; i < MAX_PAGING_FILES; i++) - { - if (PagingFileList[i] == NULL) - { - PagingFileList[i] = PagingFile; - break; - } - } - MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; MmNumberOfPagingFiles++; + MmPagingFile[MmNumberOfPagingFiles] = PagingFile; + MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; KeReleaseSpinLock(&PagingFileListLock, oldIrql); MmSwapSpaceMessage = FALSE;

1 0

01/01: [NTOSKRNL] Remove useless define
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47cd447cfa64ef7a5c7a2… commit 47cd447cfa64ef7a5c7a29471329aec54790ff71 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 23:07:53 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:07:53 2018 +0200 [NTOSKRNL] Remove useless define --- ntoskrnl/mm/pagefile.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index d1c2e0c013..4e6679bcbe 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -35,10 +35,6 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif -PVOID -NTAPI -MiFindExportedRoutineByName(IN PVOID DllBase, - IN PANSI_STRING ExportName); /* TYPES *********************************************************************/

1 0

07/07: [NTOSKRNL] Replace the alloc map by a bitmap
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f080ee13055509cc75096… commit f080ee13055509cc75096d55c7d8f2913dbd585b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 22:47:58 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:12 2018 +0200 [NTOSKRNL] Replace the alloc map by a bitmap --- ntoskrnl/mm/pagefile.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 196aeabb5b..d1c2e0c013 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -50,9 +50,8 @@ typedef struct _PAGINGFILE LARGE_INTEGER CurrentSize; PFN_NUMBER FreePages; PFN_NUMBER UsedPages; - PULONG AllocMap; + PRTL_BITMAP AllocMap; KSPIN_LOCK AllocMapLock; - ULONG AllocMapSize; } PAGINGFILE, *PPAGINGFILE; @@ -297,27 +296,13 @@ static ULONG MiAllocPageFromPagingFile(PPAGINGFILE PagingFile) { KIRQL oldIrql; - ULONG i, j; + ULONG off; KeAcquireSpinLock(&PagingFile->AllocMapLock, &oldIrql); - - for (i = 0; i < PagingFile->AllocMapSize; i++) - { - for (j = 0; j < 32; j++) - { - if (!(PagingFile->AllocMap[i] & (1 << j))) - { - PagingFile->AllocMap[i] |= (1 << j); - PagingFile->UsedPages++; - PagingFile->FreePages--; - KeReleaseSpinLock(&PagingFile->AllocMapLock, oldIrql); - return((i * 32) + j); - } - } - } - + off = RtlFindClearBitsAndSet(PagingFile->AllocMap, 1, 0); KeReleaseSpinLock(&PagingFile->AllocMapLock, oldIrql); - return(0xFFFFFFFF); + + return off; } VOID @@ -338,7 +323,7 @@ MmFreeSwapPage(SWAPENTRY Entry) } KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); - PagingFileList[i]->AllocMap[off >> 5] &= (~(1 << (off % 32))); + RtlClearBit(PagingFileList[i]->AllocMap, off >> 5); PagingFileList[i]->FreePages++; PagingFileList[i]->UsedPages--; @@ -661,11 +646,10 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PagingFile->UsedPages = 0; KeInitializeSpinLock(&PagingFile->AllocMapLock); - AllocMapSize = (PagingFile->FreePages / 32) + 1; - PagingFile->AllocMap = ExAllocatePool(NonPagedPool, - AllocMapSize * sizeof(ULONG)); - PagingFile->AllocMapSize = AllocMapSize; - + AllocMapSize = sizeof(RTL_BITMAP) + (((PagingFile->FreePages + 31) / 32) * sizeof(ULONG)); + PagingFile->AllocMap = ExAllocatePoolWithTag(NonPagedPool, + AllocMapSize, + TAG_MM); if (PagingFile->AllocMap == NULL) { ExFreePool(PagingFile); @@ -674,7 +658,10 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return(STATUS_NO_MEMORY); } - RtlZeroMemory(PagingFile->AllocMap, AllocMapSize * sizeof(ULONG)); + RtlInitializeBitMap(PagingFile->AllocMap, + (PULONG)(PagingFile->AllocMap + 1), + (ULONG)(PagingFile->FreePages)); + RtlClearAllBits(PagingFile->AllocMap); KeAcquireSpinLock(&PagingFileListLock, &oldIrql); for (i = 0; i < MAX_PAGING_FILES; i++)

1 0

06/07: [NTOSKRNL] Drop unused field
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb07332450068ba387aa5… commit fb07332450068ba387aa57966d2e8a3f2bd86eda Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 22:06:41 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:11 2018 +0200 [NTOSKRNL] Drop unused field --- ntoskrnl/mm/pagefile.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 1638fb2b4e..196aeabb5b 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -44,7 +44,6 @@ MiFindExportedRoutineByName(IN PVOID DllBase, typedef struct _PAGINGFILE { - LIST_ENTRY PagingFileListEntry; PFILE_OBJECT FileObject; HANDLE FileHandle; LARGE_INTEGER MaximumSize;

1 0

05/07: [NTOSKRNL] Revert r4668 (yeah, that was 15y ago)
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=814a6fc098805f95a4b7e… commit 814a6fc098805f95a4b7ef326160261601f2d73e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 18:37:31 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:11 2018 +0200 [NTOSKRNL] Revert r4668 (yeah, that was 15y ago) It's hardly understandable and doesn't really makes sense. Furthermore, it breaks compatibility with 3rd party FSD that don't implement such FSCTL. Obviously, Windows doesn't do this. --- ntoskrnl/mm/pagefile.c | 238 ------------------------------------------------- 1 file changed, 238 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 32dda85de0..1638fb2b4e 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -54,17 +54,9 @@ typedef struct _PAGINGFILE PULONG AllocMap; KSPIN_LOCK AllocMapLock; ULONG AllocMapSize; - PRETRIEVAL_POINTERS_BUFFER RetrievalPointers; } PAGINGFILE, *PPAGINGFILE; -typedef struct _RETRIEVEL_DESCRIPTOR_LIST -{ - struct _RETRIEVEL_DESCRIPTOR_LIST* Next; - RETRIEVAL_POINTERS_BUFFER RetrievalPointers; -} -RETRIEVEL_DESCRIPTOR_LIST, *PRETRIEVEL_DESCRIPTOR_LIST; - /* GLOBALS *******************************************************************/ #define PAIRS_PER_RUN (1024) @@ -161,63 +153,6 @@ MmShowOutOfSpaceMessagePagingFile(VOID) } } -static LARGE_INTEGER -MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER Offset) -{ - /* Simple binary search */ - ULONG first, last, mid; - first = 0; - last = RetrievalPointers->ExtentCount - 1; - while (first <= last) - { - mid = (last - first) / 2 + first; - if (Offset.QuadPart < RetrievalPointers->Extents[mid].NextVcn.QuadPart) - { - if (mid == 0) - { - Offset.QuadPart += RetrievalPointers->Extents[0].Lcn.QuadPart - RetrievalPointers->StartingVcn.QuadPart; - return Offset; - } - else - { - if (Offset.QuadPart >= RetrievalPointers->Extents[mid-1].NextVcn.QuadPart) - { - Offset.QuadPart += RetrievalPointers->Extents[mid].Lcn.QuadPart - RetrievalPointers->Extents[mid-1].NextVcn.QuadPart; - return Offset; - } - last = mid - 1; - } - } - else - { - if (mid == RetrievalPointers->ExtentCount - 1) - { - break; - } - if (Offset.QuadPart < RetrievalPointers->Extents[mid+1].NextVcn.QuadPart) - { - Offset.QuadPart += RetrievalPointers->Extents[mid+1].Lcn.QuadPart - RetrievalPointers->Extents[mid].NextVcn.QuadPart; - return Offset; - } - first = mid + 1; - } - } - KeBugCheck(MEMORY_MANAGEMENT); -#if defined(__GNUC__) - - return (LARGE_INTEGER)0LL; -#else - - { - const LARGE_INTEGER dummy = - { - {0} - }; - return dummy; - } -#endif -} - NTSTATUS NTAPI MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) @@ -254,7 +189,6 @@ MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) Mdl->MdlFlags |= MDL_PAGES_LOCKED; file_offset.QuadPart = offset * PAGE_SIZE; - file_offset = MmGetOffsetPageFile(PagingFileList[i]->RetrievalPointers, file_offset); KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoSynchronousPageWrite(PagingFileList[i]->FileObject, @@ -321,7 +255,6 @@ MiReadPageFile( Mdl->MdlFlags |= MDL_PAGES_LOCKED; file_offset.QuadPart = PageFileOffset * PAGE_SIZE; - file_offset = MmGetOffsetPageFile(PagingFile->RetrievalPointers, file_offset); KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoPageRead(PagingFile->FileObject, @@ -461,22 +394,6 @@ MmAllocSwapPage(VOID) return(0); } -static PRETRIEVEL_DESCRIPTOR_LIST FASTCALL -MmAllocRetrievelDescriptorList(ULONG Pairs) -{ - ULONG Size; - PRETRIEVEL_DESCRIPTOR_LIST RetDescList; - - Size = sizeof(RETRIEVEL_DESCRIPTOR_LIST) + Pairs * 2 * sizeof(LARGE_INTEGER); - RetDescList = ExAllocatePool(NonPagedPool, Size); - if (RetDescList) - { - RtlZeroMemory(RetDescList, Size); - } - - return RetDescList; -} - NTSTATUS NTAPI NtCreatePagingFile(IN PUNICODE_STRING FileName, IN PLARGE_INTEGER InitialSize, @@ -491,16 +408,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PPAGINGFILE PagingFile; KIRQL oldIrql; ULONG AllocMapSize; - FILE_FS_SIZE_INFORMATION FsSizeInformation; - PRETRIEVEL_DESCRIPTOR_LIST RetDescList; - PRETRIEVEL_DESCRIPTOR_LIST CurrentRetDescList; ULONG i; - ULONG BytesPerAllocationUnit; - LARGE_INTEGER Vcn; - ULONG ExtentCount; - LARGE_INTEGER MaxVcn; ULONG Count; - ULONG Size; KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedFileName; LARGE_INTEGER SafeInitialSize, SafeMaximumSize, AllocationSize; @@ -701,20 +610,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, /* DACL is no longer needed, free it */ ExFreePoolWithTag(Dacl, 'lcaD'); - Status = ZwQueryVolumeInformationFile(FileHandle, - &IoStatus, - &FsSizeInformation, - sizeof(FILE_FS_SIZE_INFORMATION), - FileFsSizeInformation); - if (!NT_SUCCESS(Status)) - { - ZwClose(FileHandle); - return Status; - } - - BytesPerAllocationUnit = FsSizeInformation.SectorsPerAllocationUnit * - FsSizeInformation.BytesPerSector; - /* Set its end of file to initial size */ Status = ZwSetInformationFile(FileHandle, &IoStatus, @@ -749,82 +644,9 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return STATUS_FLOPPY_VOLUME; } - CurrentRetDescList = RetDescList = MmAllocRetrievelDescriptorList(PAIRS_PER_RUN); - - if (CurrentRetDescList == NULL) - { - ObDereferenceObject(FileObject); - ZwClose(FileHandle); - return(STATUS_NO_MEMORY); - } - -#if defined(__GNUC__) - Vcn.QuadPart = 0LL; -#else - - Vcn.QuadPart = 0; -#endif - - ExtentCount = 0; - MaxVcn.QuadPart = (SafeInitialSize.QuadPart + BytesPerAllocationUnit - 1) / BytesPerAllocationUnit; - while(1) - { - Status = ZwFsControlFile(FileHandle, - 0, - NULL, - NULL, - &IoStatus, - FSCTL_GET_RETRIEVAL_POINTERS, - &Vcn, - sizeof(LARGE_INTEGER), - &CurrentRetDescList->RetrievalPointers, - sizeof(RETRIEVAL_POINTERS_BUFFER) + PAIRS_PER_RUN * 2 * sizeof(LARGE_INTEGER)); - if (!NT_SUCCESS(Status)) - { - while (RetDescList) - { - CurrentRetDescList = RetDescList; - RetDescList = RetDescList->Next; - ExFreePool(CurrentRetDescList); - } - ObDereferenceObject(FileObject); - ZwClose(FileHandle); - return(Status); - } - ExtentCount += CurrentRetDescList->RetrievalPointers.ExtentCount; - if (CurrentRetDescList->RetrievalPointers.Extents[CurrentRetDescList->RetrievalPointers.ExtentCount-1].NextVcn.QuadPart < MaxVcn.QuadPart) - { - CurrentRetDescList->Next = MmAllocRetrievelDescriptorList(PAIRS_PER_RUN); - if (CurrentRetDescList->Next == NULL) - { - while (RetDescList) - { - CurrentRetDescList = RetDescList; - RetDescList = RetDescList->Next; - ExFreePool(CurrentRetDescList); - } - ObDereferenceObject(FileObject); - ZwClose(FileHandle); - return(STATUS_NO_MEMORY); - } - Vcn = CurrentRetDescList->RetrievalPointers.Extents[CurrentRetDescList->RetrievalPointers.ExtentCount-1].NextVcn; - CurrentRetDescList = CurrentRetDescList->Next; - } - else - { - break; - } - } - PagingFile = ExAllocatePool(NonPagedPool, sizeof(*PagingFile)); if (PagingFile == NULL) { - while (RetDescList) - { - CurrentRetDescList = RetDescList; - RetDescList = RetDescList->Next; - ExFreePool(CurrentRetDescList); - } ObDereferenceObject(FileObject); ZwClose(FileHandle); return(STATUS_NO_MEMORY); @@ -847,29 +669,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (PagingFile->AllocMap == NULL) { - while (RetDescList) - { - CurrentRetDescList = RetDescList; - RetDescList = RetDescList->Next; - ExFreePool(CurrentRetDescList); - } - ExFreePool(PagingFile); - ObDereferenceObject(FileObject); - ZwClose(FileHandle); - return(STATUS_NO_MEMORY); - } - DPRINT("ExtentCount: %lu\n", ExtentCount); - Size = sizeof(RETRIEVAL_POINTERS_BUFFER) + ExtentCount * 2 * sizeof(LARGE_INTEGER); - PagingFile->RetrievalPointers = ExAllocatePool(NonPagedPool, Size); - if (PagingFile->RetrievalPointers == NULL) - { - while (RetDescList) - { - CurrentRetDescList = RetDescList; - RetDescList = RetDescList->Next; - ExFreePool(CurrentRetDescList); - } - ExFreePool(PagingFile->AllocMap); ExFreePool(PagingFile); ObDereferenceObject(FileObject); ZwClose(FileHandle); @@ -877,43 +676,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, } RtlZeroMemory(PagingFile->AllocMap, AllocMapSize * sizeof(ULONG)); - RtlZeroMemory(PagingFile->RetrievalPointers, Size); - - Count = 0; - PagingFile->RetrievalPointers->ExtentCount = ExtentCount; - PagingFile->RetrievalPointers->StartingVcn = RetDescList->RetrievalPointers.StartingVcn; - CurrentRetDescList = RetDescList; - while (CurrentRetDescList) - { - memcpy(&PagingFile->RetrievalPointers->Extents[Count], - CurrentRetDescList->RetrievalPointers.Extents, - CurrentRetDescList->RetrievalPointers.ExtentCount * 2 * sizeof(LARGE_INTEGER)); - Count += CurrentRetDescList->RetrievalPointers.ExtentCount; - RetDescList = CurrentRetDescList; - CurrentRetDescList = CurrentRetDescList->Next; - ExFreePool(RetDescList); - } - - if (PagingFile->RetrievalPointers->ExtentCount != ExtentCount || - PagingFile->RetrievalPointers->Extents[ExtentCount - 1].NextVcn.QuadPart != MaxVcn.QuadPart) - { - ExFreePool(PagingFile->RetrievalPointers); - ExFreePool(PagingFile->AllocMap); - ExFreePool(PagingFile); - ObDereferenceObject(FileObject); - ZwClose(FileHandle); - return(STATUS_UNSUCCESSFUL); - } - - /* - * Change the entries from lcn's to volume offset's. - */ - PagingFile->RetrievalPointers->StartingVcn.QuadPart *= BytesPerAllocationUnit; - for (i = 0; i < ExtentCount; i++) - { - PagingFile->RetrievalPointers->Extents[i].Lcn.QuadPart *= BytesPerAllocationUnit; - PagingFile->RetrievalPointers->Extents[i].NextVcn.QuadPart *= BytesPerAllocationUnit; - } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); for (i = 0; i < MAX_PAGING_FILES; i++)

1 0

04/07: [NTOSKRNL] Restrict rights on the page file
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28b4b419c249c004f0b6c… commit 28b4b419c249c004f0b6cd89012aaf72bb78ea67 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 10 08:40:02 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:11 2018 +0200 [NTOSKRNL] Restrict rights on the page file --- ntoskrnl/mm/pagefile.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 7e73002153..32dda85de0 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -505,6 +505,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, UNICODE_STRING CapturedFileName; LARGE_INTEGER SafeInitialSize, SafeMaximumSize, AllocationSize; FILE_FS_DEVICE_INFORMATION FsDeviceInfo; + SECURITY_DESCRIPTOR SecurityDescriptor; + PACL Dacl; DPRINT("NtCreatePagingFile(FileName %wZ, InitialSize %I64d)\n", FileName, InitialSize->QuadPart); @@ -564,11 +566,71 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return(Status); } + /* Create the security descriptor for the page file */ + Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + ReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode); + return Status; + } + + /* Create the DACL: we will only allow two SIDs */ + Count = sizeof(ACL) + (sizeof(ACE) + RtlLengthSid(SeLocalSystemSid)) + + (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)); + Dacl = ExAllocatePoolWithTag(PagedPool, Count, 'lcaD'); + if (Dacl == NULL) + { + ReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the DACL */ + Status = RtlCreateAcl(Dacl, Count, ACL_REVISION); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Dacl, 'lcaD'); + ReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode); + return Status; + } + + /* Grant full access to admins */ + Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, FILE_ALL_ACCESS, SeAliasAdminsSid); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Dacl, 'lcaD'); + ReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode); + return Status; + } + + /* Grant full access to SYSTEM */ + Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, FILE_ALL_ACCESS, SeLocalSystemSid); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Dacl, 'lcaD'); + ReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode); + return Status; + } + + /* Attach the DACL to the security descriptor */ + Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, TRUE, Dacl, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Dacl, 'lcaD'); + ReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode); + return Status; + } + InitializeObjectAttributes(&ObjectAttributes, &CapturedFileName, OBJ_KERNEL_HANDLE, NULL, - NULL); + &SecurityDescriptor); /* Make sure we can at least store a complete page: * If we have 2048 BytesPerAllocationUnit (FAT16 < 128MB) there is @@ -620,9 +682,25 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { DPRINT1("Failed creating page file: %lx\n", Status); + ExFreePoolWithTag(Dacl, 'lcaD'); return(Status); } + /* Set the security descriptor */ + if (NT_SUCCESS(IoStatus.Status)) + { + Status = ZwSetSecurityObject(FileHandle, DACL_SECURITY_INFORMATION, &SecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Dacl, 'lcaD'); + ZwClose(FileHandle); + return Status; + } + } + + /* DACL is no longer needed, free it */ + ExFreePoolWithTag(Dacl, 'lcaD'); + Status = ZwQueryVolumeInformationFile(FileHandle, &IoStatus, &FsSizeInformation,

1 0

03/07: [NTOSKRNL] Deny page file creation on floppy disk
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36c20dc56ba225643eec7… commit 36c20dc56ba225643eec76866f4a95cdbea219b1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 10 08:01:31 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:11 2018 +0200 [NTOSKRNL] Deny page file creation on floppy disk --- ntoskrnl/mm/pagefile.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 1ea1f07302..7e73002153 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -504,6 +504,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedFileName; LARGE_INTEGER SafeInitialSize, SafeMaximumSize, AllocationSize; + FILE_FS_DEVICE_INFORMATION FsDeviceInfo; DPRINT("NtCreatePagingFile(FileName %wZ, InitialSize %I64d)\n", FileName, InitialSize->QuadPart); @@ -660,6 +661,16 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return(Status); } + /* Deny page file creation on a floppy disk */ + FsDeviceInfo.Characteristics = 0; + IoQueryVolumeInformation(FileObject, FileFsDeviceInformation, sizeof(FsDeviceInfo), &FsDeviceInfo, &Count); + if (BooleanFlagOn(FsDeviceInfo.Characteristics, FILE_FLOPPY_DISKETTE)) + { + ObDereferenceObject(FileObject); + ZwClose(FileHandle); + return STATUS_FLOPPY_VOLUME; + } + CurrentRetDescList = RetDescList = MmAllocRetrievelDescriptorList(PAIRS_PER_RUN); if (CurrentRetDescList == NULL)

1 0

02/07: [NTOSKRNL] Properly open a page file and set appropriate attributes
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2969c28a273131c821057… commit 2969c28a273131c82105753077402b6830ef42bb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 10 07:50:16 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:11 2018 +0200 [NTOSKRNL] Properly open a page file and set appropriate attributes --- ntoskrnl/mm/pagefile.c | 66 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 523422fcf5..1ea1f07302 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -46,6 +46,7 @@ typedef struct _PAGINGFILE { LIST_ENTRY PagingFileListEntry; PFILE_OBJECT FileObject; + HANDLE FileHandle; LARGE_INTEGER MaximumSize; LARGE_INTEGER CurrentSize; PFN_NUMBER FreePages; @@ -502,7 +503,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, ULONG Size; KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedFileName; - LARGE_INTEGER SafeInitialSize, SafeMaximumSize; + LARGE_INTEGER SafeInitialSize, SafeMaximumSize, AllocationSize; DPRINT("NtCreatePagingFile(FileName %wZ, InitialSize %I64d)\n", FileName, InitialSize->QuadPart); @@ -568,25 +569,56 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, NULL, NULL); + /* Make sure we can at least store a complete page: + * If we have 2048 BytesPerAllocationUnit (FAT16 < 128MB) there is + * a problem if the paging file is fragmented. Suppose the first cluster + * of the paging file is cluster 3042 but cluster 3043 is NOT part of the + * paging file but of another file. We can't write a complete page (4096 + * bytes) to the physical location of cluster 3042 then. */ + AllocationSize.QuadPart = SafeInitialSize.QuadPart + PAGE_SIZE; + + /* First, attempt to replace the page file, if existing */ Status = IoCreateFile(&FileHandle, - FILE_ALL_ACCESS, + SYNCHRONIZE | WRITE_DAC | FILE_READ_DATA | FILE_WRITE_DATA, &ObjectAttributes, &IoStatus, - NULL, - 0, - 0, - FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_NONALERT, + &AllocationSize, + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, + FILE_SHARE_WRITE, + FILE_SUPERSEDE, + FILE_DELETE_ON_CLOSE | FILE_NO_COMPRESSION | FILE_NO_INTERMEDIATE_BUFFERING, NULL, 0, CreateFileTypeNone, NULL, SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); + /* If we failed, relax a bit constraints, someone may be already holding the + * the file, so share write, don't attempt to replace and don't delete on close + * (basically, don't do anything conflicting) + */ + if (!NT_SUCCESS(Status)) + { + Status = IoCreateFile(&FileHandle, + SYNCHRONIZE | FILE_WRITE_DATA, + &ObjectAttributes, + &IoStatus, + &AllocationSize, + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, + FILE_SHARE_WRITE | FILE_SHARE_READ, + FILE_OPEN, + FILE_NO_COMPRESSION | FILE_NO_INTERMEDIATE_BUFFERING, + NULL, + 0, + CreateFileTypeNone, + NULL, + SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); + } ReleaseCapturedUnicodeString(&CapturedFileName, PreviousMode); if (!NT_SUCCESS(Status)) { + DPRINT1("Failed creating page file: %lx\n", Status); return(Status); } @@ -603,25 +635,14 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, BytesPerAllocationUnit = FsSizeInformation.SectorsPerAllocationUnit * FsSizeInformation.BytesPerSector; - /* FIXME: If we have 2048 BytesPerAllocationUnit (FAT16 < 128MB) there is - * a problem if the paging file is fragmented. Suppose the first cluster - * of the paging file is cluster 3042 but cluster 3043 is NOT part of the - * paging file but of another file. We can't write a complete page (4096 - * bytes) to the physical location of cluster 3042 then. */ - if (BytesPerAllocationUnit % PAGE_SIZE) - { - DPRINT1("BytesPerAllocationUnit %lu is not a multiple of PAGE_SIZE %d\n", - BytesPerAllocationUnit, PAGE_SIZE); - ZwClose(FileHandle); - return STATUS_UNSUCCESSFUL; - } + /* Set its end of file to initial size */ Status = ZwSetInformationFile(FileHandle, &IoStatus, &SafeInitialSize, sizeof(LARGE_INTEGER), - FileAllocationInformation); - if (!NT_SUCCESS(Status)) + FileEndOfFileInformation); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(IoStatus.Status)) { ZwClose(FileHandle); return(Status); @@ -722,6 +743,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, RtlZeroMemory(PagingFile, sizeof(*PagingFile)); + PagingFile->FileHandle = FileHandle; PagingFile->FileObject = FileObject; PagingFile->MaximumSize.QuadPart = SafeMaximumSize.QuadPart; PagingFile->CurrentSize.QuadPart = SafeInitialSize.QuadPart; @@ -817,8 +839,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, MmNumberOfPagingFiles++; KeReleaseSpinLock(&PagingFileListLock, oldIrql); - ZwClose(FileHandle); - MmSwapSpaceMessage = FALSE; return(STATUS_SUCCESS);

1 0

01/07: [NTOSKRNL] Check that caller has appropriate right before creating page file
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ad4ef6002fc2fdd9e636… commit 0ad4ef6002fc2fdd9e636fa98384859c39d68e1c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Aug 9 21:13:08 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:01:05 2018 +0200 [NTOSKRNL] Check that caller has appropriate right before creating page file --- ntoskrnl/mm/pagefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index a30d920d22..523422fcf5 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -509,13 +509,18 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (MmNumberOfPagingFiles >= MAX_PAGING_FILES) { - return(STATUS_TOO_MANY_PAGING_FILES); + return STATUS_TOO_MANY_PAGING_FILES; } PreviousMode = ExGetPreviousMode(); if (PreviousMode != KernelMode) { + if (SeSinglePrivilegeCheck(SeCreatePagefilePrivilege, PreviousMode) != TRUE) + { + return STATUS_PRIVILEGE_NOT_HELD; + } + _SEH2_TRY { SafeInitialSize = ProbeForReadLargeInteger(InitialSize);

1 0

01/01: [DLLHOST] Add dllhost to make the device driver extractor for my Lenovo T400 happy
by Eric Kohl 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bbac124274da192c8f19… commit 2bbac124274da192c8f1958dea58ed5e41ea7ff7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 11 22:25:30 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 11 22:25:30 2018 +0200 [DLLHOST] Add dllhost to make the device driver extractor for my Lenovo T400 happy --- base/system/CMakeLists.txt | 1 + base/system/dllhost/CMakeLists.txt | 5 +++++ base/system/dllhost/dllhost.c | 30 ++++++++++++++++++++++++++++++ base/system/dllhost/dllhost.rc | 4 ++++ 4 files changed, 40 insertions(+) diff --git a/base/system/CMakeLists.txt b/base/system/CMakeLists.txt index 2afca0775b..e8372153e0 100644 --- a/base/system/CMakeLists.txt +++ b/base/system/CMakeLists.txt @@ -3,6 +3,7 @@ add_subdirectory(autochk) add_subdirectory(bootok) add_subdirectory(chkdsk) add_subdirectory(diskpart) +add_subdirectory(dllhost) add_subdirectory(expand) add_subdirectory(format) add_subdirectory(lsass) diff --git a/base/system/dllhost/CMakeLists.txt b/base/system/dllhost/CMakeLists.txt new file mode 100644 index 0000000000..0fcba164fd --- /dev/null +++ b/base/system/dllhost/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(dllhost dllhost.c dllhost.rc) +set_module_type(dllhost win32gui UNICODE) +add_importlibs(dllhost msvcrt kernel32 ntdll) +add_cd_file(TARGET dllhost DESTINATION reactos/system32 FOR all) diff --git a/base/system/dllhost/dllhost.c b/base/system/dllhost/dllhost.c new file mode 100644 index 0000000000..5275650819 --- /dev/null +++ b/base/system/dllhost/dllhost.c @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS DllHost + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: COM surrogate. + * COPYRIGHT: Copyright 2018 Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +INT +WINAPI +wWinMain( + HINSTANCE hInst, + HINSTANCE hPrevInst, + LPWSTR lpCmdLine, + INT nCmdShow) +{ + DPRINT1("dllhost: %S\n", lpCmdLine); + + return 0; +} + +/* EOF */ diff --git a/base/system/dllhost/dllhost.rc b/base/system/dllhost/dllhost.rc new file mode 100644 index 0000000000..b8ebd5ae6f --- /dev/null +++ b/base/system/dllhost/dllhost.rc @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "COM Surrogate" +#define REACTOS_STR_INTERNAL_NAME "dllhost" +#define REACTOS_STR_ORIGINAL_FILENAME "dllhost.exe" +#include <reactos/version.rc>

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018