Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS/FSRTL] Implement FsRtlAcquireToCreateMappedSection using filter callbacks
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd0445dbf21ec930d235d… commit bd0445dbf21ec930d235d30b4d8397b5348e37c7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 16 09:24:58 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:37:53 2020 +0100 [NTOS/FSRTL] Implement FsRtlAcquireToCreateMappedSection using filter callbacks --- ntoskrnl/fsrtl/fastio.c | 54 ++++++++++++++++++++++++++++++++++++++- ntoskrnl/include/internal/fsrtl.h | 8 ++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/fsrtl/fastio.c b/ntoskrnl/fsrtl/fastio.c index c9ff2f03752..a056b67e109 100644 --- a/ntoskrnl/fsrtl/fastio.c +++ b/ntoskrnl/fsrtl/fastio.c @@ -1561,15 +1561,55 @@ FsRtlAcquireFileExclusiveCommon(IN PFILE_OBJECT FileObject, PFSRTL_COMMON_FCB_HEADER FcbHeader; PDEVICE_OBJECT DeviceObject; PFAST_IO_DISPATCH FastDispatch; + PEXTENDED_DRIVER_EXTENSION DriverExtension; + PFS_FILTER_CALLBACKS FilterCallbacks; /* Get Device Object and Fast Calls */ FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; DeviceObject = IoGetRelatedDeviceObject(FileObject); - FastDispatch = DeviceObject->DriverObject->FastIoDispatch; /* Get master FsRtl lock */ FsRtlEnterFileSystem(); + DriverExtension = (PEXTENDED_DRIVER_EXTENSION)DeviceObject->DriverObject->DriverExtension; + FilterCallbacks = DriverExtension->FsFilterCallbacks; + + /* Check if Filter Cllbacks are supported */ + if (FilterCallbacks && FilterCallbacks->PreAcquireForSectionSynchronization) + { + NTSTATUS Status; + PVOID CompletionContext; + + FS_FILTER_CALLBACK_DATA CbData; + + RtlZeroMemory(&CbData, sizeof(CbData)); + + CbData.SizeOfFsFilterCallbackData = sizeof(CbData); + CbData.Operation = FS_FILTER_ACQUIRE_FOR_SECTION_SYNCHRONIZATION; + CbData.DeviceObject = DeviceObject; + CbData.FileObject = FileObject; + CbData.Parameters.AcquireForSectionSynchronization.PageProtection = Reserved; + CbData.Parameters.AcquireForSectionSynchronization.SyncType = SyncType; + + Status = FilterCallbacks->PreAcquireForSectionSynchronization(&CbData, &CompletionContext); + if (!NT_SUCCESS(Status)) + { + FsRtlExitFileSystem(); + return Status; + } + + /* Should we do something in-between ? */ + + if (FilterCallbacks->PostAcquireForSectionSynchronization) + { + FilterCallbacks->PostAcquireForSectionSynchronization(&CbData, Status, CompletionContext); + } + + return Status; + } + + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + /* Check if Fast Calls are supported, and check AcquireFileForNtCreateSection */ if (FastDispatch && FastDispatch->AcquireFileForNtCreateSection) @@ -1599,6 +1639,18 @@ FsRtlAcquireFileExclusive(IN PFILE_OBJECT FileObject) (VOID)FsRtlAcquireFileExclusiveCommon(FileObject, SyncTypeOther, 0); } +/* + * @implemented + */ +NTSTATUS +NTAPI +FsRtlAcquireToCreateMappedSection(_In_ PFILE_OBJECT FileObject, + _In_ ULONG SectionPageProtection) +{ + PAGED_CODE(); + + return FsRtlAcquireFileExclusiveCommon(FileObject, SyncTypeCreateSection, SectionPageProtection); +} /* * @implemented */ diff --git a/ntoskrnl/include/internal/fsrtl.h b/ntoskrnl/include/internal/fsrtl.h index 6e65bd78886..79cc3b6cfbc 100644 --- a/ntoskrnl/include/internal/fsrtl.h +++ b/ntoskrnl/include/internal/fsrtl.h @@ -140,3 +140,11 @@ FsRtlInitSystem( // extern PERESOURCE FsRtlPagingIoResources; extern PAGED_LOOKASIDE_LIST FsRtlFileLockLookasideList; + +// +// File locking routine +// +NTSTATUS +NTAPI +FsRtlAcquireToCreateMappedSection(_In_ PFILE_OBJECT FileObject, + _In_ ULONG SectionPageProtection);

1 0

[reactos] 01/01: [KMTEST] Test what happens when CcSetFileSizes is called with data still mapped at the tail od the file
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6929451500abaa7fadbb1… commit 6929451500abaa7fadbb1c58de102a792e7ae27e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 10:37:10 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:35:30 2020 +0100 [KMTEST] Test what happens when CcSetFileSizes is called with data still mapped at the tail od the file --- .../rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c | 23 ++++++++++++++++++++-- .../rostests/kmtests/ntos_cc/CcSetFileSizes_user.c | 3 ++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c index 3d23ab54bec..241312c12c5 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c @@ -178,7 +178,7 @@ PerformTest( Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; Fcb->Header.ValidDataLength.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; - if ((TestId > 1 && TestId < 4) || TestId == 5) + if ((TestId > 1 && TestId < 4) || TestId >= 5) { Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; } @@ -315,6 +315,25 @@ PerformTest( } } } + else if (TestId == 6) + { + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, VACB_MAPPING_GRANULARITY - PAGE_SIZE, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_ulong(Buffer[(VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + } + + KmtStartSeh(); + CcSetFileSizes(TestFileObject, &NewFileSizes); + KmtEndSeh(STATUS_SUCCESS); + + if (Ret == TRUE) + CcUnpinData(Bcb); + } } } } @@ -379,7 +398,7 @@ TestMessageHandler( ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); PerformTest(*(PULONG)Buffer, DeviceObject); break; - + case IOCTL_FINISH_TEST: ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); CleanupTest(*(PULONG)Buffer, DeviceObject); diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c index d472c5ecc98..67bcc1df89e 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c @@ -24,8 +24,9 @@ START_TEST(CcSetFileSizes) * 3: copy read - FS & AS * 4: dirty VACB - only FS * 5: dirty VACB - FS & AS + * 6: CcSetFileSizes with mapped data at tail of file */ - for (TestId = 0; TestId < 6; ++TestId) + for (TestId = 0; TestId < 7; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

[reactos] 03/03: [FASTFAT_NEW] Fix ReactOS compiler workaround
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e6866402b6ac6ec49f20… commit 9e6866402b6ac6ec49f201afabe2a3c9f8cc702d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 1 17:51:15 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:08:21 2020 +0100 [FASTFAT_NEW] Fix ReactOS compiler workaround --- drivers/filesystems/fastfat_new/allocsup.c | 224 ++++++++++++++--------------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/drivers/filesystems/fastfat_new/allocsup.c b/drivers/filesystems/fastfat_new/allocsup.c index 38c06bea2ac..c29a1efcb13 100644 --- a/drivers/filesystems/fastfat_new/allocsup.c +++ b/drivers/filesystems/fastfat_new/allocsup.c @@ -288,7 +288,7 @@ Routine Description: 1. First window with >50% free clusters 2. First empty window 3. Window with greatest number of free clusters. - + Arguments: Vcb - Supplies the Vcb for the volume @@ -305,17 +305,17 @@ Return Value: ULONG ClustersPerWindow = MAX_CLUSTER_BITMAP_SIZE; NT_ASSERT( 1 != Vcb->NumberOfWindows); - + for (i = 0; i < Vcb->NumberOfWindows; i++) { if (Vcb->Windows[i].ClustersFree == ClustersPerWindow) { - + if (-1 == FirstEmpty) { - + // // Keep note of the first empty window on the disc // - + FirstEmpty = i; } } @@ -324,7 +324,7 @@ Return Value: // // This window has the most free clusters, so far // - + MaxFree = Vcb->Windows[i].ClustersFree; Fave = i; @@ -332,9 +332,9 @@ Return Value: // If this window has >50% free clusters, then we will take it, // so don't bother considering more windows. // - + if (MaxFree >= (ClustersPerWindow >> 1)) { - + break; } } @@ -345,7 +345,7 @@ Return Value: // first empty window on the disc, if any - otherwise we'll just go with // the one with the most free clusters. // - + if ((MaxFree < (ClustersPerWindow >> 1)) && (-1 != FirstEmpty)) { Fave = FirstEmpty; @@ -354,7 +354,7 @@ Return Value: return Fave; } - + VOID FatSetupAllocationSupport ( IN PIRP_CONTEXT IrpContext, @@ -544,7 +544,7 @@ Arguments: return; } - + VOID FatTearDownAllocationSupport ( IN PIRP_CONTEXT IrpContext, @@ -613,8 +613,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatLookupFileAllocation ( IN PIRP_CONTEXT IrpContext, @@ -934,7 +934,7 @@ Arguments: *Allocated = FALSE; FcbOrDcb->Header.AllocationSize.QuadPart = CurrentVbo; - + DebugTrace( 0, Dbg, "New file allocation size = %08lx.\n", CurrentVbo); try_return ( NOTHING ); } @@ -1077,8 +1077,8 @@ Arguments: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatAddFileAllocation ( IN PIRP_CONTEXT IrpContext, @@ -1170,7 +1170,7 @@ Arguments: LBO FirstLboOfFile; NT_ASSERT( FcbOrDcb->FcbCondition == FcbGood ); - + FatGetDirentFromFcbOrDcb( IrpContext, FcbOrDcb, FALSE, @@ -1485,7 +1485,7 @@ Return Value: // // Inspired by a Prefix complaint. // - + NT_ASSERT( FcbOrDcb->FcbCondition == FcbGood ); // @@ -1538,7 +1538,7 @@ Return Value: DebugTrace(0, Dbg, "Desired size equals current allocation.\n", 0); DebugTrace(-1, Dbg, "FatTruncateFileAllocation -> (VOID)\n", 0); - return; + return; } UnwindInitialAllocationSize = FcbOrDcb->Header.AllocationSize.LowPart; @@ -1572,7 +1572,7 @@ Return Value: // NT_ASSERT( FcbOrDcb->FcbCondition == FcbGood ); - + FatGetDirentFromFcbOrDcb( IrpContext, FcbOrDcb, FALSE, &Dirent, &Bcb ); Dirent->FirstClusterOfFile = 0; @@ -1679,8 +1679,8 @@ Return Value: } _SEH2_END; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatLookupFileAllocationSize ( IN PIRP_CONTEXT IrpContext, @@ -1739,8 +1739,8 @@ Arguments: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatAllocateDiskSpace ( IN PIRP_CONTEXT IrpContext, @@ -1875,7 +1875,7 @@ Arguments: // // Make sure there are enough free clusters to start with, and - // take them now so that nobody else takes them from us. + // take them now so that nobody else takes them from us. // ExAcquireResourceSharedLite(&Vcb->ChangeBitMapResource, TRUE); @@ -1922,8 +1922,8 @@ Arguments: // Drop our shared lock on the ChangeBitMapResource, and pick it up again // exclusive in preparation for making the window swap. // - - FatUnlockFreeClusterBitMap(Vcb); + + FatUnlockFreeClusterBitMap(Vcb); ExReleaseResourceLite(&Vcb->ChangeBitMapResource); ExAcquireResourceExclusiveLite(&Vcb->ChangeBitMapResource, TRUE); FatLockFreeClusterBitMap(Vcb); @@ -1932,12 +1932,12 @@ Arguments: // // Again, test the current window against the one we want - some other - // thread could have sneaked in behind our backs and kindly set it to the one + // thread could have sneaked in behind our backs and kindly set it to the one // we need, when we dropped and reacquired the ChangeBitMapResource above. // - + if (Window != Vcb->CurrentWindow) { - + _SEH2_TRY { Wait = BooleanFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT); @@ -1947,7 +1947,7 @@ Arguments: // Change to the new window (update Vcb->CurrentWindow) and scan it // to build up a freespace bitmap etc. // - + FatExamineFatEntries( IrpContext, Vcb, 0, 0, @@ -2004,7 +2004,7 @@ Arguments: // // NOTE: Clusterhint in the Vcb is not guaranteed to be set (may be -1) // - + WindowRelativeHint = Vcb->ClusterHint; AbsoluteClusterHint = 0; @@ -2130,7 +2130,7 @@ Arguments: // it'll get converted into a true cluster number and put in Cluster, which // will be a volume relative true cluster number. // - + ULONG Index = 0; ULONG Cluster = 0; ULONG CurrentVbo = 0; @@ -2147,7 +2147,7 @@ Arguments: // Drop our shared lock on the ChangeBitMapResource, and pick it up again // exclusive in preparation for making a window swap. // - + FatUnlockFreeClusterBitMap(Vcb); ExReleaseResourceLite(&Vcb->ChangeBitMapResource); ExAcquireResourceExclusiveLite(&Vcb->ChangeBitMapResource, TRUE); @@ -2279,11 +2279,11 @@ Arguments: if ((0 == WindowRelativeHint) && (0 == ClustersFound)) { if (ClustersRemaining <= Vcb->CurrentWindow->ClustersFree) { - + // - // The remaining allocation could be satisfied entirely from this + // The remaining allocation could be satisfied entirely from this // window. We will ask only for what we need, to try and avoid - // unnecessarily fragmenting large runs of space by always using + // unnecessarily fragmenting large runs of space by always using // (part of) the largest run we can find. This call will return the // first run large enough. // @@ -2291,19 +2291,19 @@ Arguments: Index = RtlFindClearBits( &Vcb->FreeClusterBitMap, ClustersRemaining, 0); if (-1 != Index) { - + ClustersFound = ClustersRemaining; } } if (0 == ClustersFound) { - + // // Still nothing, so just take the largest free run we can find. // - + ClustersFound = RtlFindLongestRunClear( &Vcb->FreeClusterBitMap, &Index ); - + } #if DBG PreviousClear = RtlNumberOfClearBits( &Vcb->FreeClusterBitMap ); @@ -2366,7 +2366,7 @@ Arguments: ) { FaveWindow = NextWindow; - SelectedWindow = TRUE; + SelectedWindow = TRUE; } else { @@ -2394,7 +2394,7 @@ Arguments: // // Select a new window to begin allocating from // - + FaveWindow = FatSelectBestWindow( Vcb); } @@ -2403,8 +2403,8 @@ Arguments: // if (0 == Vcb->Windows[ FaveWindow].ClustersFree) { - -#ifdef _MSC_VER + +#ifdef _MSC_VER #pragma prefast( suppress: 28159, "we bugcheck here because our internal data structures are seriously corrupted if this happens" ) #endif FatBugCheck( 0, 5, 1 ); @@ -2445,7 +2445,7 @@ Arguments: FatReserveClusters( IrpContext, Vcb, (Index + 2), ClustersFound ); Cluster = Index + Window->FirstCluster; - + Window->ClustersFree -= ClustersFound; NT_ASSERT( PreviousClear - ClustersFound == Window->ClustersFree ); @@ -2593,7 +2593,7 @@ Arguments: return; } - + // // Limit our zeroing writes to 1 MB. @@ -2607,7 +2607,7 @@ FatDeallocateDiskSpace ( IN PIRP_CONTEXT IrpContext, IN PVCB Vcb, IN PLARGE_MCB Mcb, - IN BOOLEAN ZeroOnDeallocate + IN BOOLEAN ZeroOnDeallocate ) /*++ @@ -2697,7 +2697,7 @@ Return Value: KeInitializeEvent( &IoEvent, NotificationEvent, FALSE ); - + for ( McbIndex = 0; McbIndex < RunsInMcb; McbIndex++ ) { FatGetNextMcbEntry( Vcb, Mcb, McbIndex, &Vbo, &Lbo, &ByteCount ); @@ -2713,7 +2713,7 @@ Return Value: // if (ByteCount > MAX_ZERO_MDL_SIZE) { - Mdl = FatBuildZeroMdl( IrpContext, MAX_ZERO_MDL_SIZE); + Mdl = FatBuildZeroMdl( IrpContext, MAX_ZERO_MDL_SIZE); } else { Mdl = FatBuildZeroMdl( IrpContext, ByteCount); } @@ -2765,7 +2765,7 @@ Return Value: &Iosb ); if (IoIrp == NULL) { - NT_ASSERT( FALSE ); + NT_ASSERT( FALSE ); ZeroingStatus = STATUS_INSUFFICIENT_RESOURCES; goto try_exit2; } @@ -2792,14 +2792,14 @@ Return Value: } if (!NT_SUCCESS( ZeroingStatus )) { - NT_ASSERT( FALSE ); + NT_ASSERT( FALSE ); goto try_exit2; } // // Increment the starting offset where we will zero. // - + Lbo += MdlSizeMapped; // @@ -2811,13 +2811,13 @@ Return Value: if (ByteCountToZero < MdlSizeMapped) { MdlSizeMapped = ByteCountToZero; } - + } - + try_exit2: - + NOTHING; - + } _SEH2_FINALLY { if (!FlagOn( Mdl->MdlFlags, MDL_SOURCE_IS_NONPAGED_POOL) && @@ -2827,22 +2827,22 @@ Return Value: } IoFreeMdl( Mdl ); } _SEH2_END; - - } + + } try_exit: NOTHING; - + } _SEH2_EXCEPT(FatExceptionFilter( NULL, _SEH2_GetExceptionInformation() )) { - + // - // If we failed to zero for some reason, still go ahead and deallocate + // If we failed to zero for some reason, still go ahead and deallocate // the clusters. Otherwise we'll leak space from the volume. // - + ZeroingStatus = _SEH2_GetExceptionCode(); - + } _SEH2_END; } @@ -3155,7 +3155,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID FatSplitAllocation ( @@ -3225,7 +3225,7 @@ Return Value: ULONG ByteCount; -#if DBG +#if DBG ULONG BytesPerCluster; #endif @@ -3237,7 +3237,7 @@ Return Value: DebugTrace( 0, Dbg, " SplitAtVbo = %8lx\n", SplitAtVbo); DebugTrace( 0, Dbg, " RemainingMcb = %p\n", RemainingMcb); -#if DBG +#if DBG BytesPerCluster = 1 << Vcb->AllocationSupport.LogOfBytesPerCluster; #endif @@ -3341,8 +3341,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatMergeAllocation ( IN PIRP_CONTEXT IrpContext, @@ -3464,7 +3464,7 @@ Return Value: return; } - + // // Internal support routine // @@ -3556,7 +3556,7 @@ Return Value: } } - + // // Internal support routine // @@ -3744,7 +3744,7 @@ Arguments: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID FatSetFatEntry ( @@ -4130,7 +4130,7 @@ Arguments: return; } - + // // Internal support routine // @@ -4646,7 +4646,7 @@ Return Value: return; } - + // // Internal support routine // @@ -4705,7 +4705,7 @@ Return Value: DebugTrace( 0, Dbg, "Received non power of 2.\n", 0); DebugTrace(-1, Dbg, "LogOf -> %8lx\n", Log); - + #ifdef _MSC_VER #pragma prefast( suppress: 28159, "we bugcheck here because our internal data structures are seriously corrupted if this happens" ) #endif @@ -4715,7 +4715,7 @@ Return Value: return Log; } - + VOID FatExamineFatEntries( IN PIRP_CONTEXT IrpContext, @@ -4818,14 +4818,14 @@ Return Value: // // FAT32: Calculate the number of FAT entries covered by a window. This is - // equal to the number of bits in the freespace bitmap, the size of which + // equal to the number of bits in the freespace bitmap, the size of which // is hardcoded. // - + EntriesPerWindow = MAX_CLUSTER_BITMAP_SIZE; - + } else { - + EntriesPerWindow = Vcb->AllocationSupport.NumberOfClusters; } @@ -4924,44 +4924,44 @@ Return Value: // // Pick up the initial chunk of the FAT and first entry. // - + if (FatIndexBitSize == 12) { - + // // We read in the entire fat in the 12 bit case. // - + FatReadVolumeFile( IrpContext, Vcb, FatReservedBytes( &Vcb->Bpb ), FatBytesPerFat( &Vcb->Bpb ), &Bcb, (PVOID *)&FatBuffer ); - + FatLookup12BitEntry(FatBuffer, 0, &FirstFatEntry); - + } else { - + // // Read in one page of fat at a time. We cannot read in the // all of the fat we need because of cache manager limitations. // - + ULONG BytesPerEntry = FatIndexBitSize >> 3; - + FatPages = (FatReservedBytes(&Vcb->Bpb) + FatBytesPerFat(&Vcb->Bpb) + (PAGE_SIZE - 1)) / PAGE_SIZE; Page = (FatReservedBytes(&Vcb->Bpb) + StartIndex * BytesPerEntry) / PAGE_SIZE; - + Offset = Page * PAGE_SIZE; - + // // Prefetch the FAT entries in memory for optimal performance. // - + PrefetchPages = FatPages - Page; - + if (PrefetchPages > FAT_PREFETCH_PAGE_COUNT) { - + PrefetchPages = ALIGN_UP_BY(Page, FAT_PREFETCH_PAGE_COUNT) - Page; } @@ -4978,33 +4978,33 @@ Return Value: PAGE_SIZE, &Bcb, &pv); - + if (FatIndexBitSize == 32) { - + FatBuffer = (PUSHORT)((PUCHAR)pv + (FatReservedBytes(&Vcb->Bpb) + StartIndex * BytesPerEntry) % PAGE_SIZE); - + FirstFatEntry = *((PULONG)FatBuffer); FirstFatEntry = FirstFatEntry & FAT32_ENTRY_MASK; - + } else { - + FatBuffer = (PUSHORT)((PUCHAR)pv + FatReservedBytes(&Vcb->Bpb) % PAGE_SIZE) + 2; - + FirstFatEntry = *FatBuffer; } - + } - + ClusterSize = 1 << (Vcb->AllocationSupport.LogOfBytesPerCluster); - + CurrentRun = (FirstFatEntry == FAT_CLUSTER_AVAILABLE) ? FreeClusters : AllocatedClusters; - + StartIndexOfThisRun = StartIndex; - + for (FatIndex = StartIndex; FatIndex <= EndIndex; FatIndex++) { if (FatIndexBitSize == 12) { @@ -5105,8 +5105,8 @@ Return Value: FatEntry = *((PULONG)FatBuffer)++; FatEntry = FatEntry & FAT32_ENTRY_MASK; #else - FatEntry = *FatBuffer; - FatBuffer += 1; + FatEntry = *((PULONG)FatBuffer); + FatBuffer += 2; /* PUSHORT FatBuffer */ FatEntry = FatEntry & FAT32_ENTRY_MASK; #endif @@ -5173,14 +5173,14 @@ Return Value: // If the entry is marked bad, add it to the bad block MCB // - if ((SetupWindows || (Vcb->NumberOfWindows == 1)) && + if ((SetupWindows || (Vcb->NumberOfWindows == 1)) && (FatInterpretClusterType( Vcb, FatEntry ) == FatClusterBad)) { - + // // This cluster is marked bad. // Add it to the BadBlockMcb. - // - + // + Lbo = FatGetLboFromIndex( Vcb, FatIndex ); FatAddMcbEntry( Vcb, &Vcb->BadBlockMcb, BadClusterVbo, Lbo, ClusterSize ); BadClusterVbo += ClusterSize; @@ -5190,9 +5190,9 @@ Return Value: // // If we finished the scan, then we know about all the possible bad clusters. // - + SetFlag( Vcb->VcbState, VCB_STATE_FLAG_BAD_BLOCKS_POPULATED); - + // // Now we have to record the final run we encountered //

1 0

[reactos] 02/03: [FASTFAT_NEW] Tune compile options and definitions for debugging
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57cf5cdc5d0896ca537f6… commit 57cf5cdc5d0896ca537f6ffeb3b4bc2b56a325b7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 30 14:17:41 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:08:06 2020 +0100 [FASTFAT_NEW] Tune compile options and definitions for debugging --- drivers/filesystems/fastfat_new/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/filesystems/fastfat_new/CMakeLists.txt b/drivers/filesystems/fastfat_new/CMakeLists.txt index 7abdce95302..c425ff0ad3e 100644 --- a/drivers/filesystems/fastfat_new/CMakeLists.txt +++ b/drivers/filesystems/fastfat_new/CMakeLists.txt @@ -38,6 +38,9 @@ list(APPEND SOURCE add_library(fastfat MODULE ${SOURCE} fastfat.rc) set_module_type(fastfat kernelmodedriver) target_link_libraries(fastfat ${PSEH_LIB} memcmp) +if(GDB AND NOT CLANG) + target_compile_options(fastfat PRIVATE -O0) +endif() add_importlibs(fastfat ntoskrnl hal) add_pch(fastfat fatprocs.h SOURCE) add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[reactos] 01/03: [FASTFAT_NEW] Fix build
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db34250b03344ee8940b0… commit db34250b03344ee8940b0257ba1956266bf637ec Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 30 14:15:37 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:07:54 2020 +0100 [FASTFAT_NEW] Fix build --- drivers/filesystems/fastfat_new/allocsup.c | 6 ++++-- drivers/filesystems/fastfat_new/fatinit.c | 4 ---- drivers/filesystems/fastfat_new/strucsup.c | 12 ++++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/fastfat_new/allocsup.c b/drivers/filesystems/fastfat_new/allocsup.c index 4f7f8b20a43..38c06bea2ac 100644 --- a/drivers/filesystems/fastfat_new/allocsup.c +++ b/drivers/filesystems/fastfat_new/allocsup.c @@ -271,10 +271,12 @@ FatLogOf( #pragma alloc_text(PAGE, FatTruncateFileAllocation) #endif - +#ifdef __REACTOS__ +static +#endif INLINE ULONG -FatSelectBestWindow( +FatSelectBestWindow( IN PVCB Vcb ) /*++ diff --git a/drivers/filesystems/fastfat_new/fatinit.c b/drivers/filesystems/fastfat_new/fatinit.c index 09df201769f..1da067f72f3 100644 --- a/drivers/filesystems/fastfat_new/fatinit.c +++ b/drivers/filesystems/fastfat_new/fatinit.c @@ -15,10 +15,6 @@ Abstract: #include "fatprocs.h" -#ifdef __REACTOS__ -#define _Unreferenced_parameter_ -#endif - DRIVER_INITIALIZE DriverEntry; NTSTATUS diff --git a/drivers/filesystems/fastfat_new/strucsup.c b/drivers/filesystems/fastfat_new/strucsup.c index 4513be8dcb4..1efb143706d 100644 --- a/drivers/filesystems/fastfat_new/strucsup.c +++ b/drivers/filesystems/fastfat_new/strucsup.c @@ -51,6 +51,9 @@ Abstract: #define FAT_FILL_FREE 0 +#ifdef __REACTOS__ +static +#endif INLINE PCCB FatAllocateCcb ( @@ -59,6 +62,9 @@ FatAllocateCcb ( return (PCCB) FsRtlAllocatePoolWithTag( PagedPool, sizeof(CCB), TAG_CCB ); } +#ifdef __REACTOS__ +static +#endif INLINE VOID FatFreeCcb ( @@ -72,6 +78,9 @@ FatFreeCcb ( ExFreePool( Ccb ); } +#ifdef __REACTOS__ +static +#endif INLINE PFCB FatAllocateFcb ( @@ -80,6 +89,9 @@ FatAllocateFcb ( return (PFCB) FsRtlAllocatePoolWithTag( PagedPool, sizeof(FCB), TAG_FCB ); } +#ifdef __REACTOS__ +static +#endif INLINE VOID FatFreeFcb (

1 0

[reactos] 01/01: [NTOS:IO] Validate input parameters in NtQueryDirectoryFile
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef4c7ae978a6937442854… commit ef4c7ae978a6937442854ead4a1a1c942f1edcd2 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Dec 10 11:30:01 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:06:38 2020 +0100 [NTOS:IO] Validate input parameters in NtQueryDirectoryFile It turns out this is not the job of the FS driver --- ntoskrnl/io/iomgr/iofunc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 62c7799e47a..80814a70ba3 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -2052,6 +2052,26 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, _SEH2_END; } + /* Check input parameters */ + + switch (FileInformationClass) + { +#define CHECK_LENGTH(class, struct) \ + case class: \ + if (Length < sizeof(struct)) \ + return STATUS_INFO_LENGTH_MISMATCH; \ + break + CHECK_LENGTH(FileDirectoryInformation, FILE_DIRECTORY_INFORMATION); + CHECK_LENGTH(FileFullDirectoryInformation, FILE_FULL_DIR_INFORMATION); + CHECK_LENGTH(FileIdFullDirectoryInformation, FILE_ID_FULL_DIR_INFORMATION); + CHECK_LENGTH(FileNamesInformation, FILE_NAMES_INFORMATION); + CHECK_LENGTH(FileBothDirectoryInformation, FILE_BOTH_DIR_INFORMATION); + CHECK_LENGTH(FileIdBothDirectoryInformation, FILE_ID_BOTH_DIR_INFORMATION); + default: + break; +#undef CHECK_LENGTH + } + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, FILE_LIST_DIRECTORY,

1 0

[reactos] 01/01: [NTOS:IO] Do not set Shared property of the file if we are failing in IoCheckShareAccess
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d1dba51db2208e300570… commit 1d1dba51db2208e300570c58ffe2272e0c34a1a8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 14 15:51:15 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:05:00 2020 +0100 [NTOS:IO] Do not set Shared property of the file if we are failing in IoCheckShareAccess --- ntoskrnl/io/iomgr/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 5004938c099..548c7f28db7 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -3429,11 +3429,6 @@ IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - /* Set them */ - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - /* Check if the shared access is violated */ if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || @@ -3449,6 +3444,11 @@ IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, return STATUS_SHARING_VIOLATION; } + /* Set them */ + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + /* It's not, check if caller wants us to update it */ if (Update) {

1 0

[reactos] 01/01: [KMTESTS] Add more tests for CcMapData & CcPinRead
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=115b8290cd77d5f091937… commit 115b8290cd77d5f0919378e49df1e76f87b3bea5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 18 15:23:22 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:03:51 2020 +0100 [KMTESTS] Add more tests for CcMapData & CcPinRead Those show the shortcomings of the current implementation in ReactOS --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 48 +++++++-- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 130 +++++++++++++++++++---- 2 files changed, 146 insertions(+), 32 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 12e8286b936..5e43eb77408 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -371,28 +371,58 @@ PerformTest( } else if (TestId == 4) { + FileSizes.AllocationSize.QuadPart += VACB_MAPPING_GRANULARITY; + CcSetFileSizes(TestFileObject, &FileSizes); + /* Map after EOF */ Ret = FALSE; Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000; KmtStartSeh(); - Ret = CcMapData(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, MAP_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - ok(Ret == FALSE, "CcMapData succeed\n"); + ok(Ret == TRUE, "CcMapData failed\n"); if (Ret) { CcUnpinData(Bcb); } - /* Map a VACB after EOF */ + /* Map a VACB after EOF. */ Ret = FALSE; Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; KmtStartSeh(); - Ret = CcMapData(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); - KmtEndSeh(STATUS_ACCESS_VIOLATION); - ok(Ret == FALSE, "CcMapData succeed\n"); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == TRUE, "CcMapData failed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + /* Map after Allocation */ + Ret = FALSE; + Offset.QuadPart = FileSizes.AllocationSize.QuadPart + 0x1000; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == TRUE, "CcMapData failed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + Ret = FALSE; + Offset.QuadPart = FileSizes.AllocationSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == TRUE, "CcMapData failed\n"); if (Ret) { @@ -404,9 +434,9 @@ PerformTest( Offset.QuadPart = 0x0; KmtStartSeh(); - Ret = CcMapData(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, 0, &Bcb, (PVOID *)&Buffer); + Ret = CcMapData(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, MAP_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - ok(Ret == FALSE, "CcMapData succeed\n"); + ok(Ret == TRUE, "CcMapData failed\n"); if (Ret) { @@ -475,7 +505,7 @@ TestMessageHandler( ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); PerformTest(*(PULONG)Buffer, DeviceObject); break; - + case IOCTL_FINISH_TEST: ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); CleanupTest(*(PULONG)Buffer, DeviceObject); diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 40a802b566e..3f18625d893 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -36,6 +36,9 @@ static BOOLEAN TestWriteCalled = FALSE; static ULONGLONG Memory = 0; static BOOLEAN TS = FALSE; +LARGE_INTEGER WriteOffset; +ULONG WriteLength; + NTSTATUS TestEntry( _In_ PDRIVER_OBJECT DriverObject, @@ -558,15 +561,17 @@ PerformTest( } else if (TestId == 5) { + FileSizes.AllocationSize.QuadPart += VACB_MAPPING_GRANULARITY; + CcSetFileSizes(TestFileObject, &FileSizes); + /* Pin after EOF */ Ret = FALSE; Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000; KmtStartSeh(); - Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, PIN_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - ok(Ret == FALSE, "CcPinRead succeed\n"); - + ok(Ret == TRUE, "CcPinRead failed\n"); if (Ret) { CcUnpinData(Bcb); @@ -577,13 +582,60 @@ PerformTest( Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; KmtStartSeh(); - Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); - KmtEndSeh(STATUS_ACCESS_VIOLATION); - ok(Ret == FALSE, "CcPinRead succeed\n"); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, PIN_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == TRUE, "CcPinRead failed\n"); + if (Ret) + { + CcUnpinData(Bcb); + } + + /* Pin after Allocation */ + Ret = FALSE; + Offset.QuadPart = FileSizes.AllocationSize.QuadPart + 0x1000; + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, PIN_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == TRUE, "CcPinRead failed\n"); if (Ret) { + /* Set this one dirty */ + CcSetDirtyPinnedData(Bcb, NULL); + CcUnpinData(Bcb); + + WriteOffset.QuadPart = -1LL; + WriteLength = MAXULONG; + /* Flush to trigger the write */ + CcFlushCache(TestFileObject->SectionObjectPointer, &Offset, 0x1000, NULL); + + ok_eq_longlong(WriteOffset.QuadPart, Offset.QuadPart); + ok_eq_ulong(WriteLength, 0x1000); + } + + /* Pin a VACB after Allocation */ + Ret = FALSE; + Offset.QuadPart = FileSizes.AllocationSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, PIN_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == TRUE, "CcPinRead failed\n"); + if (Ret) + { + /* Set this one dirty */ + CcSetDirtyPinnedData(Bcb, NULL); + + CcUnpinData(Bcb); + + WriteOffset.QuadPart = -1LL; + WriteLength = MAXULONG; + /* Flush to trigger the write */ + CcFlushCache(TestFileObject->SectionObjectPointer, &Offset, 0x1000, NULL); + + ok_eq_longlong(WriteOffset.QuadPart, Offset.QuadPart); + ok_eq_ulong(WriteLength, 0x1000); } /* Pin more than a VACB */ @@ -591,13 +643,23 @@ PerformTest( Offset.QuadPart = 0x0; KmtStartSeh(); - Ret = CcPinRead(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, 0, &Bcb, (PVOID *)&Buffer); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, PIN_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - ok(Ret == FALSE, "CcPinRead succeed\n"); - + ok(Ret == TRUE, "CcPinRead failed\n"); if (Ret) { + /* Set this one dirty */ + CcSetDirtyPinnedData(Bcb, NULL); + CcUnpinData(Bcb); + + /* The data is dirtified through the VACB */ + WriteOffset.QuadPart = -1LL; + WriteLength = MAXULONG; + CcFlushCache(TestFileObject->SectionObjectPointer, &Offset, VACB_MAPPING_GRANULARITY + 0x1000, NULL); + + ok_eq_longlong(WriteOffset.QuadPart, Offset.QuadPart); + ok_eq_ulong(WriteLength, VACB_MAPPING_GRANULARITY + 0x1000); } } else if (TestId == 6) @@ -690,7 +752,7 @@ TestMessageHandler( ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); PerformTest(*(PULONG)Buffer, DeviceObject); break; - + case IOCTL_FINISH_TEST: ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); CleanupTest(*(PULONG)Buffer, DeviceObject); @@ -775,28 +837,50 @@ TestIrpHandler( Offset = IoStack->Parameters.Write.ByteOffset; Length = IoStack->Parameters.Write.Length; - ok(TestTestId == 6, "Unexpected test id: %d\n", TestTestId); + ok((TestTestId == 5) || (TestTestId == 6), "Unexpected test id: %d\n", TestTestId); ok_eq_pointer(DeviceObject, TestDeviceObject); ok_eq_pointer(IoStack->FileObject, TestFileObject); ok(FlagOn(Irp->Flags, IRP_NOCACHE), "Not coming from Cc\n"); ok_irql(PASSIVE_LEVEL); - ok(Offset.QuadPart == 0, "Offset is not null: %I64i\n", Offset.QuadPart); - ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); - ok(Length == PAGE_SIZE * 4, "Length is not MappedLength-sized: %I64i\n", Length); - Buffer = MapAndLockUserBuffer(Irp, Length); - ok(Buffer != NULL, "Null pointer!\n"); + if (TestTestId == 5) + { + /* This assumes continuous writes. */ + if (WriteOffset.QuadPart != -1) + { + LONGLONG WriteEnd = WriteOffset.QuadPart + WriteLength; - Mdl = Irp->MdlAddress; - ok(Mdl != NULL, "Null pointer for MDL!\n"); - ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); - ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); - ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + if (WriteOffset.QuadPart > Offset.QuadPart) + WriteOffset = Offset; + if (WriteEnd < (Offset.QuadPart + Length)) + WriteLength = (Offset.QuadPart + Length) - WriteOffset.QuadPart; + } + else + { + WriteOffset = Offset; + WriteLength = Length; + } + } + else + { + ok(Offset.QuadPart == 0, "Offset is not null: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); + ok(Length == PAGE_SIZE * 4, "Length is not MappedLength-sized: %I64i\n", Length); - ok_bool_false(TestWriteCalled, "Write has been unexpectedly called twice!\n"); - TestWriteCalled = TRUE; + Buffer = MapAndLockUserBuffer(Irp, Length); + ok(Buffer != NULL, "Null pointer!\n"); + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + + ok_bool_false(TestWriteCalled, "Write has been unexpectedly called twice!\n"); + TestWriteCalled = TRUE; + } Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length;

1 0

[reactos] 01/01: [NTOS:IO] Do not pass bogus file offset to the FS in NtReadFile & NtWriteFile
by Jérôme Gardou 22 Dec '20

22 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6c0af2e218cba4dc6f1a… commit a6c0af2e218cba4dc6f1a9b2254f9a37a997ff6a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 18 17:21:01 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 22 11:02:33 2020 +0100 [NTOS:IO] Do not pass bogus file offset to the FS in NtReadFile & NtWriteFile --- ntoskrnl/io/iomgr/iofunc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 627ff9644b3..62c7799e47a 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -2776,6 +2776,14 @@ NtReadFile(IN HANDLE FileHandle, if (Key) CapturedKey = *Key; } + /* Check for invalid offset */ + if ((CapturedByteOffset.QuadPart < 0) && (CapturedByteOffset.QuadPart != -2)) + { + /* -2 is FILE_USE_FILE_POINTER_POSITION */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Check for event */ if (Event) { @@ -3827,6 +3835,15 @@ NtWriteFile(IN HANDLE FileHandle, if (Key) CapturedKey = *Key; } + /* Check for invalid offset */ + if (CapturedByteOffset.QuadPart < -2) + { + /* -1 is FILE_WRITE_TO_END_OF_FILE */ + /* -2 is FILE_USE_FILE_POINTER_POSITION */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Check if this is an append operation */ if ((ObjectHandleInfo.GrantedAccess & (FILE_APPEND_DATA | FILE_WRITE_DATA)) == FILE_APPEND_DATA)

1 0

[reactos] 01/01: [WINLOGON] Add hidden logon/logoff SFC notification
by Eric Kohl 21 Dec '20

21 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94f01f5b6418204c78685… commit 94f01f5b6418204c786859267cbe9b28b0ee2b13 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 21 20:42:40 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 21 20:42:40 2020 +0100 [WINLOGON] Add hidden logon/logoff SFC notification --- base/system/winlogon/notify.c | 110 +++++++++++++++++++++++++++++++++++------- 1 file changed, 93 insertions(+), 17 deletions(-) diff --git a/base/system/winlogon/notify.c b/base/system/winlogon/notify.c index c0b78dc7b9b..d84e06af47f 100644 --- a/base/system/winlogon/notify.c +++ b/base/system/winlogon/notify.c @@ -43,6 +43,7 @@ typedef struct _NOTIFICATION_ITEM BOOL bImpersonate; BOOL bSmartCardLogon; DWORD dwMaxWait; + BOOL bSfcNotification; } NOTIFICATION_ITEM, *PNOTIFICATION_ITEM; @@ -51,6 +52,58 @@ static LIST_ENTRY NotificationDllListHead; /* FUNCTIONS *****************************************************************/ +static +VOID +AddSfcNotification(VOID) +{ + WCHAR szSfcFileName[MAX_PATH]; + PNOTIFICATION_ITEM NotificationDll; + DWORD dwError = ERROR_SUCCESS; + + ExpandEnvironmentStringsW(L"%windir%\\system32\\sfc.dll", + szSfcFileName, + ARRAYSIZE(szSfcFileName)); + + NotificationDll = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(NOTIFICATION_ITEM)); + if (NotificationDll == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + NotificationDll->pszDllName = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(szSfcFileName) + 1) * sizeof(WCHAR)); + if (NotificationDll->pszDllName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + wcscpy(NotificationDll->pszDllName, szSfcFileName); + + NotificationDll->bEnabled = TRUE; + NotificationDll->dwMaxWait = 30; /* FIXME: ??? */ + NotificationDll->bSfcNotification = TRUE; + + InsertHeadList(&NotificationDllListHead, + &NotificationDll->ListEntry); + +done: + if (dwError != ERROR_SUCCESS) + { + if (NotificationDll != NULL) + { + if (NotificationDll->pszDllName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll->pszDllName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll); + } + } +} + static VOID AddNotificationDll( @@ -209,6 +262,8 @@ InitNotifications(VOID) InitializeListHead(&NotificationDllListHead); + AddSfcNotification(); + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\Notify", 0, @@ -262,27 +317,47 @@ CallNotificationDll( CHAR szFuncBuffer[128]; DWORD dwSize; DWORD dwType; - DWORD dwError; + DWORD dwError = ERROR_SUCCESS; PWLX_NOTIFY_HANDLER pNotifyHandler; - dwError = RegOpenKeyExW(hNotifyKey, - NotificationDll->pszKeyName, - 0, - KEY_READ, - &hDllKey); - if (dwError != ERROR_SUCCESS) + if (NotificationDll->bSfcNotification) { - TRACE("RegOpenKeyExW()\n"); - return; + switch (Type) + { + case LogonHandler: + strcpy(szFuncBuffer, "SfcWLEventLogon"); + break; + + case LogoffHandler: + strcpy(szFuncBuffer, "SfcWLEventLogoff"); + break; + + default: + return; + } + } + else + { + dwError = RegOpenKeyExW(hNotifyKey, + NotificationDll->pszKeyName, + 0, + KEY_READ, + &hDllKey); + if (dwError != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW()\n"); + return; + } + + dwSize = sizeof(szFuncBuffer); + dwError = RegQueryValueExA(hDllKey, + FuncNames[Type], + NULL, + &dwType, + (PBYTE)szFuncBuffer, + &dwSize); } - dwSize = sizeof(szFuncBuffer); - dwError = RegQueryValueExA(hDllKey, - FuncNames[Type], - NULL, - &dwType, - (PBYTE)szFuncBuffer, - &dwSize); if (dwError == ERROR_SUCCESS) { hModule = LoadLibraryW(NotificationDll->pszDllName); @@ -296,7 +371,8 @@ CallNotificationDll( } } - RegCloseKey(hDllKey); + if (hDllKey != NULL) + RegCloseKey(hDllKey); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs