Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

[reactos] 01/01: [FASTFAT] Add a wrapper around FsRtlNotifyFullReportChange

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8294118174b28a10daec3… commit 8294118174b28a10daec3f763d8b5ab64104d1fa Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 7 14:16:11 2018 +0100 [FASTFAT] Add a wrapper around FsRtlNotifyFullReportChange --- drivers/filesystems/fastfat/cleanup.c | 15 ++-- drivers/filesystems/fastfat/create.c | 28 +++----- drivers/filesystems/fastfat/finfo.c | 130 ++++++++++++---------------------- drivers/filesystems/fastfat/misc.c | 2 +- drivers/filesystems/fastfat/rw.c | 10 +-- drivers/filesystems/fastfat/vfat.h | 22 ++++++ 6 files changed, 82 insertions(+), 125 deletions(-) diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index d584dee859..abdeb0b0c6 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -124,16 +124,11 @@ VfatCleanupFile( { VfatDelEntry(DeviceExt, pFcb, NULL); - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&pFcb->PathNameU, - pFcb->PathNameU.Length - pFcb->LongNameU.Length, - NULL, - NULL, - vfatFCBIsDirectory(pFcb) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME, - FILE_ACTION_REMOVED, - NULL); + vfatReportChange(DeviceExt, + pFcb, + vfatFCBIsDirectory(pFcb) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME, + FILE_ACTION_REMOVED); } if (pFcb->OpenHandleCount != 0) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 1ba61fdd38..7ecc0ffae1 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -1002,29 +1002,19 @@ VfatCreateFile( if (Irp->IoStatus.Information == FILE_CREATED) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&pFcb->PathNameU, - pFcb->PathNameU.Length - pFcb->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(pFcb) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - FILE_ACTION_ADDED, - NULL); + vfatReportChange(DeviceExt, + pFcb, + (vfatFCBIsDirectory(pFcb) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + FILE_ACTION_ADDED); } else if (Irp->IoStatus.Information == FILE_OVERWRITTEN || Irp->IoStatus.Information == FILE_SUPERSEDED) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&pFcb->PathNameU, - pFcb->PathNameU.Length - pFcb->LongNameU.Length, - NULL, - NULL, - FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE, - FILE_ACTION_MODIFIED, - NULL); + vfatReportChange(DeviceExt, + pFcb, + FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE, + FILE_ACTION_MODIFIED); } pFcb->OpenHandleCount++; diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 03b7d3cc93..1befeebe00 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -269,12 +269,10 @@ VfatSetBasicInformation( if (NotifyFilter != 0) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, NULL, NotifyFilter, FILE_ACTION_MODIFIED, - NULL); + vfatReportChange(DeviceExt, + FCB, + NotifyFilter, + FILE_ACTION_MODIFIED); } return STATUS_SUCCESS; @@ -822,29 +820,19 @@ VfatSetRenameInformation( if (FsRtlAreNamesEqual(&SourceFile, &NewFile, TRUE, NULL)) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(FCB) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - FILE_ACTION_RENAMED_OLD_NAME, - NULL); + vfatReportChange(DeviceExt, + FCB, + (vfatFCBIsDirectory(FCB) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + FILE_ACTION_RENAMED_OLD_NAME); Status = vfatRenameEntry(DeviceExt, FCB, &NewFile, TRUE); if (NT_SUCCESS(Status)) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(FCB) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - FILE_ACTION_RENAMED_NEW_NAME, - NULL); + vfatReportChange(DeviceExt, + FCB, + (vfatFCBIsDirectory(FCB) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + FILE_ACTION_RENAMED_NEW_NAME); } } else @@ -865,44 +853,29 @@ VfatSetRenameInformation( goto Cleanup; } - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(FCB) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - (DeletedTarget ? FILE_ACTION_REMOVED : FILE_ACTION_RENAMED_OLD_NAME), - NULL); + vfatReportChange(DeviceExt, + FCB, + (vfatFCBIsDirectory(FCB) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + (DeletedTarget ? FILE_ACTION_REMOVED : FILE_ACTION_RENAMED_OLD_NAME)); Status = vfatRenameEntry(DeviceExt, FCB, &NewFile, FALSE); if (NT_SUCCESS(Status)) { if (DeletedTarget) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE - | FILE_NOTIFY_CHANGE_LAST_ACCESS | FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_EA, - FILE_ACTION_MODIFIED, - NULL); + vfatReportChange(DeviceExt, + FCB, + FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE + | FILE_NOTIFY_CHANGE_LAST_ACCESS | FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_EA, + FILE_ACTION_MODIFIED); } else { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(FCB) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - FILE_ACTION_RENAMED_NEW_NAME, - NULL); + vfatReportChange(DeviceExt, + FCB, + (vfatFCBIsDirectory(FCB) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + FILE_ACTION_RENAMED_NEW_NAME); } } } @@ -936,44 +909,29 @@ VfatSetRenameInformation( UNREFERENCED_PARAMETER(NewReferences); #endif - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(FCB) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - FILE_ACTION_REMOVED, - NULL); + vfatReportChange(DeviceExt, + FCB, + (vfatFCBIsDirectory(FCB) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + FILE_ACTION_REMOVED); Status = VfatMoveEntry(DeviceExt, FCB, &NewFile, ParentFCB); if (NT_SUCCESS(Status)) { if (DeletedTarget) { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE - | FILE_NOTIFY_CHANGE_LAST_ACCESS | FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_EA, - FILE_ACTION_MODIFIED, - NULL); + vfatReportChange(DeviceExt, + FCB, + FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE + | FILE_NOTIFY_CHANGE_LAST_ACCESS | FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_EA, + FILE_ACTION_MODIFIED); } else { - FsRtlNotifyFullReportChange(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - (PSTRING)&FCB->PathNameU, - FCB->PathNameU.Length - FCB->LongNameU.Length, - NULL, - NULL, - (vfatFCBIsDirectory(FCB) ? - FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), - FILE_ACTION_ADDED, - NULL); + vfatReportChange(DeviceExt, + FCB, + (vfatFCBIsDirectory(FCB) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), + FILE_ACTION_ADDED); } } } diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/fastfat/misc.c index d16507dd2a..7797f37ab2 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/fastfat/misc.c @@ -468,4 +468,4 @@ VfatCheckForDismount( } return Delete; -} +} diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index c945ee6044..25114f25cf 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -1070,15 +1070,7 @@ Metadata: Filter = FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_ATTRIBUTES; if (ByteOffset.QuadPart != OldFileSize.QuadPart) Filter |= FILE_NOTIFY_CHANGE_SIZE; - FsRtlNotifyFullReportChange(IrpContext->DeviceExt->NotifySync, - &(IrpContext->DeviceExt->NotifyList), - (PSTRING)&Fcb->PathNameU, - Fcb->PathNameU.Length - Fcb->LongNameU.Length, - NULL, - NULL, - Filter, - FILE_ACTION_MODIFIED, - NULL); + vfatReportChange(IrpContext->DeviceExt, Fcb, Filter, FILE_ACTION_MODIFIED); } } diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index b84b320573..f6e2aa6452 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -602,6 +602,21 @@ vfatVolumeIsFatX(PDEVICE_EXTENSION DeviceExt) return BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX); } +FORCEINLINE +VOID +vfatReportChange( + IN PDEVICE_EXTENSION DeviceExt, + IN PVFATFCB Fcb, + IN ULONG FilterMatch, + IN ULONG Action) +{ + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), + (PSTRING)&Fcb->PathNameU, + Fcb->PathNameU.Length - Fcb->LongNameU.Length, + NULL, NULL, FilterMatch, Action, NULL); +} + #define vfatAddToStat(Vcb, Stat, Inc) \ { \ PSTATISTICS Stats = &(Vcb)->Statistics[KeGetCurrentProcessorNumber() % VfatGlobalData->NumberProcessors]; \ @@ -1033,6 +1048,13 @@ VfatCheckForDismount( IN PDEVICE_EXTENSION DeviceExt, IN BOOLEAN Create); +VOID +vfatReportChange( + IN PDEVICE_EXTENSION DeviceExt, + IN PVFATFCB Fcb, + IN ULONG FilterMatch, + IN ULONG Action); + /* pnp.c */ NTSTATUS

6 years, 11 months

[reactos] 01/01: [DRWTSN32] Fix amd64 build

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=168223aeb88f5503dedc6… commit 168223aeb88f5503dedc60b982a1ba80d972703d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 7 12:03:44 2018 +0100 [DRWTSN32] Fix amd64 build --- base/applications/drwtsn32/main.cpp | 32 ++++++++++++++++++++++++++++--- base/applications/drwtsn32/stacktrace.cpp | 17 +++++++++++----- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/base/applications/drwtsn32/main.cpp b/base/applications/drwtsn32/main.cpp index 2ac1e057e1..8503233179 100644 --- a/base/applications/drwtsn32/main.cpp +++ b/base/applications/drwtsn32/main.cpp @@ -91,15 +91,41 @@ void PrintBugreport(FILE* output, DumpData& data) xfprintf(output, NEWLINE "State Dump for Thread Id 0x%x" NEWLINE NEWLINE, it->first); const CONTEXT& ctx = it->second.Context; - if (ctx.ContextFlags & CONTEXT_INTEGER) + if ((ctx.ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { +#if defined(_M_IX86) xfprintf(output, "eax:%p ebx:%p ecx:%p edx:%p esi:%p edi:%p" NEWLINE, ctx.Eax, ctx.Ebx, ctx.Ecx, ctx.Edx, ctx.Esi, ctx.Edi); - if (ctx.ContextFlags & CONTEXT_CONTROL) +#elif defined(_M_AMD64) + xfprintf(output, "rax:%p rbx:%p rcx:%p rdx:%p rsi:%p rdi:%p" NEWLINE, + ctx.Rax, ctx.Rbx, ctx.Rcx, ctx.Rdx, ctx.Rsi, ctx.Rdi); + xfprintf(output, "r8:%p r9:%p r10:%p r11:%p r12:%p r13:%p r14:%p r15:%p" NEWLINE, + ctx.R8, ctx.R9, ctx.R10, ctx.R11, ctx.R12, ctx.R13, ctx.R14, ctx.R15); +#else +#error Unknown architecture +#endif + } + if ((ctx.ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { +#if defined(_M_IX86) xfprintf(output, "eip:%p esp:%p ebp:%p" NEWLINE, ctx.Eip, ctx.Esp, ctx.Ebp); - if (ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS) +#elif defined(_M_AMD64) + xfprintf(output, "eip:%p esp:%p ebp:%p" NEWLINE, + ctx.Rip, ctx.Rsp, ctx.Rbp); +#else +#error Unknown architecture +#endif + } + if ((ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) + { +#if defined(_M_IX86) || defined(_M_AMD64) xfprintf(output, "dr0:%p dr1:%p dr2:%p dr3:%p dr6:%p dr7:%p" NEWLINE, ctx.Dr0, ctx.Dr1, ctx.Dr2, ctx.Dr3, ctx.Dr6, ctx.Dr7); +#else +#error Unknown architecture +#endif + } PrintStackBacktrace(output, data, it->second); } diff --git a/base/applications/drwtsn32/stacktrace.cpp b/base/applications/drwtsn32/stacktrace.cpp index a867150ca4..5c93f78834 100644 --- a/base/applications/drwtsn32/stacktrace.cpp +++ b/base/applications/drwtsn32/stacktrace.cpp @@ -104,8 +104,15 @@ void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) } UCHAR stackData[0x10 * 10]; - DWORD dwSizeRead; - if (!ReadProcessMemory(data.ProcessHandle, (LPCVOID)thread.Context.Esp, stackData, sizeof(stackData), &dwSizeRead)) + SIZE_T sizeRead; +#if defined(_M_IX86) + ULONG_PTR stackPointer = thread.Context.Esp; +#elif defined(_M_AMD64) + ULONG_PTR stackPointer = thread.Context.Rsp; +#else +#error Unknown architecture +#endif + if (!ReadProcessMemory(data.ProcessHandle, (PVOID)stackPointer, stackData, sizeof(stackData), &sizeRead)) return; xfprintf(output, NEWLINE "*----> Raw Stack Dump <----*" NEWLINE NEWLINE); @@ -119,14 +126,14 @@ void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) for (size_t j = 0; j < 8; ++j) { size_t idx = j + n; - if (idx < dwSizeRead) + if (idx < sizeRead) { HexData1[j * 3] = ToChar(stackData[idx] >> 4); HexData1[j * 3 + 1] = ToChar(stackData[idx] & 0xf); AsciiData1[j] = isprint(stackData[idx]) ? stackData[idx] : '.'; } idx += 8; - if (idx < dwSizeRead) + if (idx < sizeRead) { HexData2[j * 3] = ToChar(stackData[idx] >> 4); HexData2[j * 3 + 1] = ToChar(stackData[idx] & 0xf); @@ -134,6 +141,6 @@ void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) } } - xfprintf(output, "%p %s - %s %s%s" NEWLINE, thread.Context.Esp+n, HexData1, HexData2, AsciiData1, AsciiData2); + xfprintf(output, "%p %s - %s %s%s" NEWLINE, stackPointer+n, HexData1, HexData2, AsciiData1, AsciiData2); } }

6 years, 11 months

[reactos] 02/02: [FASTFAT] When a file gets overwritten, notify about the changes

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a36b632ef2c6d1c39d89… commit 2a36b632ef2c6d1c39d89cc305f114c289a96b30 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 7 11:44:25 2018 +0100 [FASTFAT] When a file gets overwritten, notify about the changes --- drivers/filesystems/fastfat/create.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index b9acc7f1c3..1ba61fdd38 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -1013,6 +1013,19 @@ VfatCreateFile( FILE_ACTION_ADDED, NULL); } + else if (Irp->IoStatus.Information == FILE_OVERWRITTEN || + Irp->IoStatus.Information == FILE_SUPERSEDED) + { + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), + (PSTRING)&pFcb->PathNameU, + pFcb->PathNameU.Length - pFcb->LongNameU.Length, + NULL, + NULL, + FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE, + FILE_ACTION_MODIFIED, + NULL); + } pFcb->OpenHandleCount++; DeviceExt->OpenHandleCount++;

6 years, 11 months

[reactos] 01/02: [FASTFAT] When overwriting a file, also update its write time

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffeb3f070bdb5a2c1556e… commit ffeb3f070bdb5a2c1556e9fe463603758b47906a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 7 11:34:41 2018 +0100 [FASTFAT] When overwriting a file, also update its write time --- drivers/filesystems/fastfat/create.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index f1b9b37325..b9acc7f1c3 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -923,6 +923,8 @@ VfatCreateFile( if (!vfatFCBIsDirectory(pFcb)) { + LARGE_INTEGER SystemTime; + if (RequestedDisposition == FILE_SUPERSEDE) { *pFcb->Attributes = Attributes; @@ -932,6 +934,21 @@ VfatCreateFile( *pFcb->Attributes |= Attributes; } *pFcb->Attributes |= FILE_ATTRIBUTE_ARCHIVE; + + KeQuerySystemTime(&SystemTime); + if (vfatVolumeIsFatX(DeviceExt)) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &SystemTime, &pFcb->entry.FatX.UpdateDate, + &pFcb->entry.FatX.UpdateTime); + } + else + { + FsdSystemTimeToDosDateTime(DeviceExt, + &SystemTime, &pFcb->entry.Fat.UpdateDate, + &pFcb->entry.Fat.UpdateTime); + } + VfatUpdateEntry(pFcb, vfatVolumeIsFatX(DeviceExt)); }

6 years, 11 months

[reactos] 01/01: [FASTFAT] When dealing with attributes on IRP_MJ_CREATE, filter user input to ensure we have only attributes we can handle. This applies to files newly created, or for files overwritten where attributes are reset/modified.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0eacb0b1ef379df265cd9… commit 0eacb0b1ef379df265cd96ef1df4302a459dc5c5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 6 22:02:10 2018 +0100 [FASTFAT] When dealing with attributes on IRP_MJ_CREATE, filter user input to ensure we have only attributes we can handle. This applies to files newly created, or for files overwritten where attributes are reset/modified. --- drivers/filesystems/fastfat/create.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 49c54207cd..f1b9b37325 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -728,7 +728,11 @@ VfatCreateFile( return Status; } - Attributes = Stack->Parameters.Create.FileAttributes & ~FILE_ATTRIBUTE_NORMAL; + Attributes = (Stack->Parameters.Create.FileAttributes & (FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_READONLY)); /* If the file open failed then create the required file */ if (!NT_SUCCESS (Status)) @@ -750,7 +754,7 @@ VfatCreateFile( } vfatSplitPathName(&PathNameU, NULL, &FileNameU); Status = VfatAddEntry(DeviceExt, &FileNameU, &pFcb, ParentFcb, RequestedOptions, - (UCHAR)FlagOn(Attributes, FILE_ATTRIBUTE_VALID_FLAGS), NULL); + Attributes, NULL); vfatReleaseFCB(DeviceExt, ParentFcb); if (NT_SUCCESS(Status)) { @@ -921,11 +925,11 @@ VfatCreateFile( { if (RequestedDisposition == FILE_SUPERSEDE) { - *pFcb->Attributes = Attributes & ~FILE_ATTRIBUTE_NORMAL; + *pFcb->Attributes = Attributes; } else { - *pFcb->Attributes |= Attributes & ~FILE_ATTRIBUTE_NORMAL; + *pFcb->Attributes |= Attributes; } *pFcb->Attributes |= FILE_ATTRIBUTE_ARCHIVE; VfatUpdateEntry(pFcb, vfatVolumeIsFatX(DeviceExt));

6 years, 11 months

[reactos] 01/01: [NTFS] Apply fix from 52f0726: allow partial info copy on dir enumeration on first entry return. This is assorted with misc fixes to make this code closer to what we currently have in FastFAT. This also allows fixing a memory leak in case of single entry return.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bea4ec07eadf78e29b1b… commit 7bea4ec07eadf78e29b1bafda9b20872ebbf60a7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 6 21:39:25 2018 +0100 [NTFS] Apply fix from 52f0726: allow partial info copy on dir enumeration on first entry return. This is assorted with misc fixes to make this code closer to what we currently have in FastFAT. This also allows fixing a memory leak in case of single entry return. CORE-13367 --- drivers/filesystems/ntfs/dirctl.c | 298 +++++++++++++++++++++++++------------- 1 file changed, 198 insertions(+), 100 deletions(-) diff --git a/drivers/filesystems/ntfs/dirctl.c b/drivers/filesystems/ntfs/dirctl.c index 3c8d3cdb9a..4ad76fa382 100644 --- a/drivers/filesystems/ntfs/dirctl.c +++ b/drivers/filesystems/ntfs/dirctl.c @@ -60,18 +60,32 @@ NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt, } +#define ULONG_ROUND_UP(x) ROUND_UP((x), (sizeof(ULONG))) + + static NTSTATUS NtfsGetNamesInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, ULONGLONG MFTIndex, PFILE_NAMES_INFORMATION Info, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { ULONG Length; + NTSTATUS Status; + ULONG BytesToCopy = 0; PFILENAME_ATTRIBUTE FileName; DPRINT("NtfsGetNamesInformation() called\n"); + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; + if (FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) > BufferLength) + { + return Status; + } + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { @@ -81,15 +95,28 @@ NtfsGetNamesInformation(PDEVICE_EXTENSION DeviceExt, } Length = FileName->NameLength * sizeof (WCHAR); - if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); + if (First || (BufferLength >= FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) + Length)) + { + Info->FileNameLength = Length; - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_NAMES_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, FileName->Name, Length); + *Written = FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName); + Info->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)) + { + BytesToCopy = min(Length, BufferLength - FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)); + RtlCopyMemory(Info->FileName, FileName->Name, BytesToCopy); + *Written += BytesToCopy; - return(STATUS_SUCCESS); + if (BytesToCopy == Length) + { + Info->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_NAMES_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } + } + } + + return Status; } @@ -98,14 +125,25 @@ NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, ULONGLONG MFTIndex, PFILE_DIRECTORY_INFORMATION Info, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { ULONG Length; + NTSTATUS Status; + ULONG BytesToCopy = 0; PFILENAME_ATTRIBUTE FileName; PSTANDARD_INFORMATION StdInfo; DPRINT("NtfsGetDirectoryInformation() called\n"); + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; + if (FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName) > BufferLength) + { + return Status; + } + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { @@ -118,27 +156,40 @@ NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt, ASSERT(StdInfo != NULL); Length = FileName->NameLength * sizeof (WCHAR); - if ((sizeof(FILE_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); + if (First || (BufferLength >= FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName) + Length)) + { + Info->FileNameLength = Length; - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, FileName->Name, Length); + *Written = FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName); + Info->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName)) + { + BytesToCopy = min(Length, BufferLength - FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName)); + RtlCopyMemory(Info->FileName, FileName->Name, BytesToCopy); + *Written += BytesToCopy; - Info->CreationTime.QuadPart = FileName->CreationTime; - Info->LastAccessTime.QuadPart = FileName->LastAccessTime; - Info->LastWriteTime.QuadPart = FileName->LastWriteTime; - Info->ChangeTime.QuadPart = FileName->ChangeTime; + if (BytesToCopy == Length) + { + Info->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } + } - /* Convert file flags */ - NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); + Info->CreationTime.QuadPart = FileName->CreationTime; + Info->LastAccessTime.QuadPart = FileName->LastAccessTime; + Info->LastWriteTime.QuadPart = FileName->LastWriteTime; + Info->ChangeTime.QuadPart = FileName->ChangeTime; - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->FileIndex = MFTIndex; + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); - return STATUS_SUCCESS; + Info->FileIndex = MFTIndex; + } + + return Status; } @@ -147,14 +198,25 @@ NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, ULONGLONG MFTIndex, PFILE_FULL_DIRECTORY_INFORMATION Info, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { ULONG Length; + NTSTATUS Status; + ULONG BytesToCopy = 0; PFILENAME_ATTRIBUTE FileName; PSTANDARD_INFORMATION StdInfo; DPRINT("NtfsGetFullDirectoryInformation() called\n"); + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; + if (FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName) > BufferLength) + { + return Status; + } + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { @@ -167,28 +229,41 @@ NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, ASSERT(StdInfo != NULL); Length = FileName->NameLength * sizeof (WCHAR); - if ((sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); + if (First || (BufferLength >= FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName) + Length)) + { + Info->FileNameLength = Length; - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, FileName->Name, Length); + *Written = FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName); + Info->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName)) + { + BytesToCopy = min(Length, BufferLength - FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName)); + RtlCopyMemory(Info->FileName, FileName->Name, BytesToCopy); + *Written += BytesToCopy; + + if (BytesToCopy == Length) + { + Info->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_FULL_DIR_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } + } - Info->CreationTime.QuadPart = FileName->CreationTime; - Info->LastAccessTime.QuadPart = FileName->LastAccessTime; - Info->LastWriteTime.QuadPart = FileName->LastWriteTime; - Info->ChangeTime.QuadPart = FileName->ChangeTime; + Info->CreationTime.QuadPart = FileName->CreationTime; + Info->LastAccessTime.QuadPart = FileName->LastAccessTime; + Info->LastWriteTime.QuadPart = FileName->LastWriteTime; + Info->ChangeTime.QuadPart = FileName->ChangeTime; - /* Convert file flags */ - NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); - Info->FileIndex = MFTIndex; - Info->EaSize = 0; + Info->FileIndex = MFTIndex; + Info->EaSize = 0; + } - return STATUS_SUCCESS; + return Status; } @@ -197,14 +272,25 @@ NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, ULONGLONG MFTIndex, PFILE_BOTH_DIR_INFORMATION Info, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { ULONG Length; + NTSTATUS Status; + ULONG BytesToCopy = 0; PFILENAME_ATTRIBUTE FileName, ShortFileName; PSTANDARD_INFORMATION StdInfo; DPRINT("NtfsGetBothDirectoryInformation() called\n"); + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; + if (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName) > BufferLength) + { + return Status; + } + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { @@ -218,41 +304,54 @@ NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, ASSERT(StdInfo != NULL); Length = FileName->NameLength * sizeof (WCHAR); - if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); + if (First || (BufferLength >= FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName) + Length)) + { + Info->FileNameLength = Length; - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, FileName->Name, Length); + *Written = FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName); + Info->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName)) + { + BytesToCopy = min(Length, BufferLength - FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName)); + RtlCopyMemory(Info->FileName, FileName->Name, BytesToCopy); + *Written += BytesToCopy; - if (ShortFileName) - { - /* Should we upcase the filename? */ - ASSERT(ShortFileName->NameLength <= ARRAYSIZE(Info->ShortName)); - Info->ShortNameLength = ShortFileName->NameLength * sizeof(WCHAR); - RtlCopyMemory(Info->ShortName, ShortFileName->Name, Info->ShortNameLength); - } - else - { - Info->ShortName[0] = 0; - Info->ShortNameLength = 0; - } + if (BytesToCopy == Length) + { + Info->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } + } + + if (ShortFileName) + { + /* Should we upcase the filename? */ + ASSERT(ShortFileName->NameLength <= ARRAYSIZE(Info->ShortName)); + Info->ShortNameLength = ShortFileName->NameLength * sizeof(WCHAR); + RtlCopyMemory(Info->ShortName, ShortFileName->Name, Info->ShortNameLength); + } + else + { + Info->ShortName[0] = 0; + Info->ShortNameLength = 0; + } - Info->CreationTime.QuadPart = FileName->CreationTime; - Info->LastAccessTime.QuadPart = FileName->LastAccessTime; - Info->LastWriteTime.QuadPart = FileName->LastWriteTime; - Info->ChangeTime.QuadPart = FileName->ChangeTime; + Info->CreationTime.QuadPart = FileName->CreationTime; + Info->LastAccessTime.QuadPart = FileName->LastAccessTime; + Info->LastWriteTime.QuadPart = FileName->LastWriteTime; + Info->ChangeTime.QuadPart = FileName->ChangeTime; - /* Convert file flags */ - NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); - Info->FileIndex = MFTIndex; - Info->EaSize = 0; + Info->FileIndex = MFTIndex; + Info->EaSize = 0; + } - return STATUS_SUCCESS; + return Status; } @@ -277,6 +376,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) PFILE_RECORD_HEADER FileRecord; ULONGLONG MFTRecord, OldMFTRecord = 0; UNICODE_STRING Pattern; + ULONG Written; DPRINT1("NtfsQueryDirectory() called\n"); @@ -350,7 +450,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) /* Determine directory index */ if (Stack->Flags & SL_INDEX_SPECIFIED) { - Ccb->Entry = Ccb->CurrentByteOffset.u.LowPart; + Ccb->Entry = FileIndex; } else if (First || (Stack->Flags & SL_RESTART_SCAN)) { @@ -369,6 +469,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) return STATUS_PENDING; } + Written = 0; while (Status == STATUS_SUCCESS && BufferLength > 0) { Status = NtfsFindFileAt(DeviceExtension, @@ -400,7 +501,9 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) FileRecord, MFTRecord, (PFILE_NAMES_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; case FileDirectoryInformation: @@ -408,7 +511,9 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) FileRecord, MFTRecord, (PFILE_DIRECTORY_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; case FileFullDirectoryInformation: @@ -416,7 +521,9 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) FileRecord, MFTRecord, (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; case FileBothDirectoryInformation: @@ -424,66 +531,57 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) FileRecord, MFTRecord, (PFILE_BOTH_DIR_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; default: Status = STATUS_INVALID_INFO_CLASS; } - if (Status == STATUS_BUFFER_OVERFLOW) + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_INVALID_INFO_CLASS) { - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } break; } } else { - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } - - if (First) - { - Status = STATUS_NO_SUCH_FILE; - } - else - { - Status = STATUS_NO_MORE_FILES; - } + Status = (First ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES); break; } Buffer0 = (PFILE_NAMES_INFORMATION)Buffer; Buffer0->FileIndex = FileIndex++; Ccb->Entry++; + BufferLength -= Buffer0->NextEntryOffset; + + ExFreeToNPagedLookasideList(&DeviceExtension->FileRecLookasideList, FileRecord); if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) { break; } - BufferLength -= Buffer0->NextEntryOffset; + Buffer += Buffer0->NextEntryOffset; - ExFreeToNPagedLookasideList(&DeviceExtension->FileRecLookasideList, FileRecord); } if (Buffer0) { Buffer0->NextEntryOffset = 0; + Status = STATUS_SUCCESS; + IrpContext->Irp->IoStatus.Information = Stack->Parameters.QueryDirectory.Length - BufferLength; + } + else + { + ASSERT(Status != STATUS_SUCCESS || BufferLength == 0); + ASSERT(Written <= Stack->Parameters.QueryDirectory.Length); + IrpContext->Irp->IoStatus.Information = Written; } ExReleaseResourceLite(&DeviceExtension->DirResource); ExReleaseResourceLite(&Fcb->MainResource); - if (FileIndex > 0) - { - Status = STATUS_SUCCESS; - } - return Status; }

6 years, 11 months

[reactos] 06/06: [NTOS:MM] Pass FaultCode to MiDispatchFault

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1014d50a4be27ab91988a… commit 1014d50a4be27ab91988a3c6ddd0eb07b2b3a5d8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 1 22:40:43 2018 +0100 [NTOS:MM] Pass FaultCode to MiDispatchFault --- ntoskrnl/mm/ARM3/pagfault.c | 16 ++++++++-------- ntoskrnl/mm/i386/page.c | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 191ef21e54..c75c4596e6 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -1274,7 +1274,7 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, NTSTATUS NTAPI -MiDispatchFault(IN BOOLEAN StoreInstruction, +MiDispatchFault(IN ULONG FaultCode, IN PVOID Address, IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, @@ -1333,7 +1333,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, } /* Resolve the fault -- this will release the PFN lock */ - Status = MiResolveProtoPteFault(StoreInstruction, + Status = MiResolveProtoPteFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, PointerProtoPte, @@ -1450,7 +1450,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, if (++ProcessedPtes == PteCount) { /* Complete the fault */ - MiCompleteProtoPteFault(StoreInstruction, + MiCompleteProtoPteFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, PointerProtoPte, @@ -1489,7 +1489,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, ASSERT(PointerPte->u.Hard.Valid == 0); /* Resolve the fault -- this will release the PFN lock */ - Status = MiResolveProtoPteFault(StoreInstruction, + Status = MiResolveProtoPteFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, PointerProtoPte, @@ -1537,7 +1537,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, LockIrql = MiAcquirePfnLock(); /* Resolve */ - Status = MiResolveTransitionFault(StoreInstruction, Address, PointerPte, Process, LockIrql, &InPageBlock); + Status = MiResolveTransitionFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, Process, LockIrql, &InPageBlock); ASSERT(NT_SUCCESS(Status)); @@ -1576,7 +1576,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, LockIrql = MiAcquirePfnLock(); /* Resolve */ - Status = MiResolvePageFileFault(StoreInstruction, Address, PointerPte, Process, &LockIrql); + Status = MiResolvePageFileFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, Process, &LockIrql); /* And now release the lock and leave*/ MiReleasePfnLock(LockIrql); @@ -2028,7 +2028,7 @@ _WARN("Session space stuff is not implemented yet!") } /* Now do the real fault handling */ - Status = MiDispatchFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), + Status = MiDispatchFault(FaultCode, Address, PointerPte, ProtoPte, @@ -2480,7 +2480,7 @@ UserFault: } /* Dispatch the fault */ - Status = MiDispatchFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), + Status = MiDispatchFault(FaultCode, Address, PointerPte, ProtoPte, diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 4ed0ebc29f..1bc842deeb 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -191,7 +191,7 @@ ProtectToPTE(ULONG flProtect) NTSTATUS NTAPI -MiDispatchFault(IN BOOLEAN StoreInstruction, +MiDispatchFault(IN ULONG FaultCode, IN PVOID Address, IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, @@ -262,7 +262,8 @@ MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) ASSERT(PointerPde->u.Long == 0); MI_WRITE_INVALID_PTE(PointerPde, DemandZeroPde); - Status = MiDispatchFault(TRUE, + // Tiny HACK: Parameter 1 is the architecture specific FaultCode for an access violation (i.e. page is present) + Status = MiDispatchFault(0x1, Pt, PointerPde, NULL,

6 years, 11 months

[reactos] 05/06: [NTOS:MM] Mark local functions with static

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f426aabde1a20015ad46… commit 3f426aabde1a20015ad4631f1fb27d3afc97ed74 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 2 11:31:37 2018 +0100 [NTOS:MM] Mark local functions with static --- ntoskrnl/mm/ARM3/pagfault.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 71c8ea6b73..191ef21e54 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -24,6 +24,7 @@ BOOLEAN UserPdeFault = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ +static NTSTATUS NTAPI MiCheckForUserStackOverflow(IN PVOID Address, @@ -140,6 +141,7 @@ MiIsAccessAllowed( return (AccessAllowedMask[Write != 0][Execute != 0] >> ProtectionMask) & 1; } +static NTSTATUS NTAPI MiAccessCheck(IN PMMPTE PointerPte, @@ -208,6 +210,7 @@ MiAccessCheck(IN PMMPTE PointerPte, return STATUS_SUCCESS; } +static PMMPTE NTAPI MiCheckVirtualAddress(IN PVOID VirtualAddress, @@ -310,6 +313,7 @@ MiCheckVirtualAddress(IN PVOID VirtualAddress, } #if (_MI_PAGING_LEVELS == 2) +static NTSTATUS FASTCALL MiCheckPdeForSessionSpace(IN PVOID Address) @@ -727,6 +731,7 @@ MiResolveDemandZeroFault(IN PVOID Address, return STATUS_PAGE_FAULT_DEMAND_ZERO; } +static NTSTATUS NTAPI MiCompleteProtoPteFault(IN BOOLEAN StoreInstruction, @@ -851,6 +856,7 @@ MiCompleteProtoPteFault(IN BOOLEAN StoreInstruction, return STATUS_SUCCESS; } +static NTSTATUS NTAPI MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, @@ -935,6 +941,7 @@ MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, return Status; } +static NTSTATUS NTAPI MiResolveTransitionFault(IN BOOLEAN StoreInstruction, @@ -1066,6 +1073,7 @@ MiResolveTransitionFault(IN BOOLEAN StoreInstruction, return STATUS_PAGE_FAULT_TRANSITION; } +static NTSTATUS NTAPI MiResolveProtoPteFault(IN BOOLEAN StoreInstruction,

6 years, 11 months

[reactos] 04/06: [NTOS:MM] Add support for NX page-faults

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a00378a1a1a1c12917ffa… commit a00378a1a1a1c12917ffa629da3a052c07fd7e4a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 2 11:22:22 2018 +0100 [NTOS:MM] Add support for NX page-faults --- ntoskrnl/include/internal/amd64/mm.h | 2 ++ ntoskrnl/include/internal/arm/mm.h | 2 ++ ntoskrnl/include/internal/i386/mm.h | 6 ++++++ ntoskrnl/mm/ARM3/pagfault.c | 31 ++++++++++++++++++++++++++++++- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index d2769fd859..3b0b217bd9 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -98,6 +98,7 @@ #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Writable == 1) #endif #define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) +#define MI_IS_PAGE_EXECUTABLE(x) ((x)->u.Hard.NoExecute == 0) #define MI_IS_PAGE_DIRTY(x) ((x)->u.Hard.Dirty == 1) #define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) #if !defined(CONFIG_SMP) @@ -109,6 +110,7 @@ /* Macros to identify the page fault reason from the error code */ #define MI_IS_NOT_PRESENT_FAULT(FaultCode) !BooleanFlagOn(FaultCode, 0x1) #define MI_IS_WRITE_ACCESS(FaultCode) BooleanFlagOn(FaultCode, 0x2) +#define MI_IS_INSTRUCTION_FETCH(FaultCode) BooleanFlagOn(FaultCode, 0x10) /* On x64, these are the same */ #define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE diff --git a/ntoskrnl/include/internal/arm/mm.h b/ntoskrnl/include/internal/arm/mm.h index 0d08a55cdf..0e2e79d15c 100644 --- a/ntoskrnl/include/internal/arm/mm.h +++ b/ntoskrnl/include/internal/arm/mm.h @@ -84,6 +84,7 @@ #define MI_IS_PAGE_LARGE(x) FALSE #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ReadOnly == 0) #define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE +#define MI_IS_PAGE_EXECUTABLE(x) TRUE #define MI_IS_PAGE_DIRTY(x) TRUE #define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) #define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ReadOnly = 0) @@ -91,6 +92,7 @@ /* Macros to identify the page fault reason from the error code */ #define MI_IS_NOT_PRESENT_FAULT(FaultCode) TRUE #define MI_IS_WRITE_ACCESS(FaultCode) TRUE +#define MI_IS_INSTRUCTION_FETCH(FaultCode) FALSE /* Convert an address to a corresponding PTE */ #define MiAddressToPte(x) \ diff --git a/ntoskrnl/include/internal/i386/mm.h b/ntoskrnl/include/internal/i386/mm.h index 573de1eb45..7d5c5ed667 100644 --- a/ntoskrnl/include/internal/i386/mm.h +++ b/ntoskrnl/include/internal/i386/mm.h @@ -103,6 +103,11 @@ #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Writable == 1) #endif #define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) +#ifdef _PAE_ +#define MI_IS_PAGE_EXECUTABLE(x) ((x)->u.Hard.NoExecute == 0) +#else +#define MI_IS_PAGE_EXECUTABLE(x) TRUE +#endif #define MI_IS_PAGE_DIRTY(x) ((x)->u.Hard.Dirty == 1) #define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) #if !defined(CONFIG_SMP) @@ -115,6 +120,7 @@ /* Macros to identify the page fault reason from the error code */ #define MI_IS_NOT_PRESENT_FAULT(FaultCode) !BooleanFlagOn(FaultCode, 0x1) #define MI_IS_WRITE_ACCESS(FaultCode) BooleanFlagOn(FaultCode, 0x2) +#define MI_IS_INSTRUCTION_FETCH(FaultCode) BooleanFlagOn(FaultCode, 0x10) /* On x86, these two are the same */ #define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index e5225fd63b..71c8ea6b73 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -1780,6 +1780,17 @@ MmArmAccessFault(IN ULONG FaultCode, 11); } } + + /* Check for execution of non-executable memory */ + if (MI_IS_INSTRUCTION_FETCH(FaultCode) && + !MI_IS_PAGE_EXECUTABLE(&TempPte)) + { + KeBugCheckEx(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, + (ULONG_PTR)Address, + (ULONG_PTR)TempPte.u.Long, + (ULONG_PTR)TrapInformation, + 1); + } } /* Release PFN lock and return all good */ @@ -1886,6 +1897,17 @@ _WARN("Session space stuff is not implemented yet!") } } + /* Check for execution of non-executable memory */ + if (MI_IS_INSTRUCTION_FETCH(FaultCode) && + !MI_IS_PAGE_EXECUTABLE(&TempPte)) + { + KeBugCheckEx(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, + (ULONG_PTR)Address, + (ULONG_PTR)TempPte.u.Long, + (ULONG_PTR)TrapInformation, + 2); + } + /* Check for read-only write in session space */ if ((IsSessionAddress) && MI_IS_WRITE_ACCESS(FaultCode) && @@ -2196,7 +2218,14 @@ UserFault: } } - /* FIXME: Execution is ignored for now, since we don't have no-execute pages yet */ + /* Check for execution of non-executable memory */ + if (MI_IS_INSTRUCTION_FETCH(FaultCode) && + !MI_IS_PAGE_EXECUTABLE(&TempPte)) + { + /* Return the status */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_ACCESS_VIOLATION; + } /* The fault has already been resolved by a different thread */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread);

6 years, 11 months

[reactos] 03/06: [NTOS:MM] Make use of FaultCode and MI_IS_NOT_PRESENT_FAULT and MI_IS_WRITE_ACCESS macros in MmArmAccessFault.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d043aa05ea8cf7741a4d… commit 4d043aa05ea8cf7741a4d93bb6792202781000b5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 1 23:03:56 2018 +0100 [NTOS:MM] Make use of FaultCode and MI_IS_NOT_PRESENT_FAULT and MI_IS_WRITE_ACCESS macros in MmArmAccessFault. --- ntoskrnl/include/internal/amd64/mm.h | 1 + ntoskrnl/include/internal/arm/mm.h | 1 + ntoskrnl/include/internal/i386/mm.h | 1 + ntoskrnl/mm/ARM3/pagfault.c | 31 +++++++++++++++---------------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index 0d28381422..d2769fd859 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -108,6 +108,7 @@ /* Macros to identify the page fault reason from the error code */ #define MI_IS_NOT_PRESENT_FAULT(FaultCode) !BooleanFlagOn(FaultCode, 0x1) +#define MI_IS_WRITE_ACCESS(FaultCode) BooleanFlagOn(FaultCode, 0x2) /* On x64, these are the same */ #define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE diff --git a/ntoskrnl/include/internal/arm/mm.h b/ntoskrnl/include/internal/arm/mm.h index bc26ab72d8..0d08a55cdf 100644 --- a/ntoskrnl/include/internal/arm/mm.h +++ b/ntoskrnl/include/internal/arm/mm.h @@ -90,6 +90,7 @@ /* Macros to identify the page fault reason from the error code */ #define MI_IS_NOT_PRESENT_FAULT(FaultCode) TRUE +#define MI_IS_WRITE_ACCESS(FaultCode) TRUE /* Convert an address to a corresponding PTE */ #define MiAddressToPte(x) \ diff --git a/ntoskrnl/include/internal/i386/mm.h b/ntoskrnl/include/internal/i386/mm.h index d38ab01c31..573de1eb45 100644 --- a/ntoskrnl/include/internal/i386/mm.h +++ b/ntoskrnl/include/internal/i386/mm.h @@ -114,6 +114,7 @@ /* Macros to identify the page fault reason from the error code */ #define MI_IS_NOT_PRESENT_FAULT(FaultCode) !BooleanFlagOn(FaultCode, 0x1) +#define MI_IS_WRITE_ACCESS(FaultCode) BooleanFlagOn(FaultCode, 0x2) /* On x86, these two are the same */ #define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index b85a25be05..e5225fd63b 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -1644,7 +1644,6 @@ MmArmAccessFault(IN ULONG FaultCode, ULONG Color; BOOLEAN IsSessionAddress; PMMPFN Pfn1; - BOOLEAN StoreInstruction = !MI_IS_NOT_PRESENT_FAULT(FaultCode); DPRINT("ARM3 FAULT AT: %p\n", Address); /* Check for page fault on high IRQL */ @@ -1694,10 +1693,10 @@ MmArmAccessFault(IN ULONG FaultCode, /* Not yet implemented in ReactOS */ ASSERT(MI_IS_PAGE_LARGE(PointerPde) == FALSE); - ASSERT(((StoreInstruction) && MI_IS_PAGE_COPY_ON_WRITE(PointerPte)) == FALSE); + ASSERT((!MI_IS_NOT_PRESENT_FAULT(FaultCode) && MI_IS_PAGE_COPY_ON_WRITE(PointerPte)) == FALSE); /* Check if this was a write */ - if (StoreInstruction) + if (MI_IS_WRITE_ACCESS(FaultCode)) { /* Was it to a read-only page? */ Pfn1 = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); @@ -1745,7 +1744,7 @@ MmArmAccessFault(IN ULONG FaultCode, /* PXE/PPE/PDE (still) not valid, kill the system */ KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, (ULONG_PTR)Address, - StoreInstruction, + FaultCode, (ULONG_PTR)TrapInformation, 2); } @@ -1766,7 +1765,7 @@ MmArmAccessFault(IN ULONG FaultCode, if (TempPte.u.Hard.Valid) { /* Check if this was a write */ - if (StoreInstruction) + if (MI_IS_WRITE_ACCESS(FaultCode)) { /* Was it to a read-only page? */ Pfn1 = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); @@ -1799,7 +1798,7 @@ MmArmAccessFault(IN ULONG FaultCode, /* It failed, this address is invalid */ KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, (ULONG_PTR)Address, - StoreInstruction, + FaultCode, (ULONG_PTR)TrapInformation, 6); } @@ -1867,7 +1866,7 @@ _WARN("Session space stuff is not implemented yet!") if (TempPte.u.Hard.Valid == 1) { /* Check if this was a write */ - if (StoreInstruction) + if (MI_IS_WRITE_ACCESS(FaultCode)) { /* Was it to a read-only page that is not copy on write? */ Pfn1 = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); @@ -1889,7 +1888,7 @@ _WARN("Session space stuff is not implemented yet!") /* Check for read-only write in session space */ if ((IsSessionAddress) && - (StoreInstruction) && + MI_IS_WRITE_ACCESS(FaultCode) && !MI_IS_PAGE_WRITEABLE(&TempPte)) { /* Sanity check */ @@ -1932,7 +1931,7 @@ _WARN("Session space stuff is not implemented yet!") /* Bad boy, bad boy, whatcha gonna do, whatcha gonna do when ARM3 comes for you! */ KeBugCheckEx(DRIVER_CAUGHT_MODIFYING_FREED_POOL, (ULONG_PTR)Address, - StoreInstruction, + FaultCode, Mode, 4); } @@ -1962,7 +1961,7 @@ _WARN("Session space stuff is not implemented yet!") /* Bugcheck the system! */ KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, (ULONG_PTR)Address, - StoreInstruction, + FaultCode, (ULONG_PTR)TrapInformation, 1); } @@ -1973,14 +1972,14 @@ _WARN("Session space stuff is not implemented yet!") /* Bugcheck the system! */ KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, (ULONG_PTR)Address, - StoreInstruction, + FaultCode, (ULONG_PTR)TrapInformation, 0); } } /* Check for demand page */ - if ((StoreInstruction) && + if (MI_IS_WRITE_ACCESS(FaultCode) && !(ProtoPte) && !(IsSessionAddress) && !(TempPte.u.Hard.Valid)) @@ -1999,7 +1998,7 @@ _WARN("Session space stuff is not implemented yet!") } /* Now do the real fault handling */ - Status = MiDispatchFault(StoreInstruction, + Status = MiDispatchFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, ProtoPte, @@ -2148,7 +2147,7 @@ UserFault: if (TempPte.u.Hard.Valid) { /* Check if this is a write on a readonly PTE */ - if (StoreInstruction) + if (MI_IS_WRITE_ACCESS(FaultCode)) { /* Is this a copy on write PTE? */ if (MI_IS_PAGE_COPY_ON_WRITE(&TempPte)) @@ -2417,7 +2416,7 @@ UserFault: { /* Run a software access check first, including to detect guard pages */ Status = MiAccessCheck(PointerPte, - StoreInstruction, + !MI_IS_NOT_PRESENT_FAULT(FaultCode), Mode, ProtectionCode, TrapInformation, @@ -2444,7 +2443,7 @@ UserFault: } /* Dispatch the fault */ - Status = MiDispatchFault(StoreInstruction, + Status = MiDispatchFault(!MI_IS_NOT_PRESENT_FAULT(FaultCode), Address, PointerPte, ProtoPte,

6 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
37
38
Older →

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 January 2018