Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-23 08:53:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: FspSafeMdlCreate: testing

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-03-07 17:53:52 -08:00
parent 26b5d8a458
commit 9aca7e2e81
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sys/read.c
View File

@ -288,6 +288,7 @@ NTSTATUS FspFsvolReadComplete(
} }
FSP_FSCTL_TRANSACT_REQ *Request = FspIrpRequest(Irp); FSP_FSCTL_TRANSACT_REQ *Request = FspIrpRequest(Irp);
FSP_SAFE_MDL *SafeMdl = FspIopRequestContext(Request, RequestSafeMdl);
PFILE_OBJECT FileObject = IrpSp->FileObject; PFILE_OBJECT FileObject = IrpSp->FileObject;
FSP_FILE_NODE *FileNode = FileObject->FsContext; FSP_FILE_NODE *FileNode = FileObject->FsContext;
LARGE_INTEGER ReadOffset = IrpSp->Parameters.Read.ByteOffset; LARGE_INTEGER ReadOffset = IrpSp->Parameters.Read.ByteOffset;
@ -296,6 +297,8 @@ NTSTATUS FspFsvolReadComplete(
ULONG InfoChangeNumber; ULONG InfoChangeNumber;
BOOLEAN Success; BOOLEAN Success;
FspSafeMdlCopyBack(SafeMdl);
if (!PagingIo) if (!PagingIo)
{ {
if (FspFsctlTransactReadKind == Request->Kind) if (FspFsctlTransactReadKind == Request->Kind)

23
src/sys/util.c
View File

@ -514,6 +514,7 @@ NTSTATUS FspSafeMdlCreate(PMDL UserMdl, LOCK_OPERATION Operation, FSP_SAFE_MDL *
goto exit; goto exit;
} }
RtlZeroMemory(SafeMdl, sizeof *SafeMdl); RtlZeroMemory(SafeMdl, sizeof *SafeMdl);
SafeMdl->Operation = Operation;
SafeMdl->Mdl = IoAllocateMdl(VirtualAddress, ByteCount, FALSE, FALSE, 0); SafeMdl->Mdl = IoAllocateMdl(VirtualAddress, ByteCount, FALSE, FALSE, 0);
if (0 == SafeMdl->Mdl) if (0 == SafeMdl->Mdl)
@ -542,7 +543,7 @@ NTSTATUS FspSafeMdlCreate(PMDL UserMdl, LOCK_OPERATION Operation, FSP_SAFE_MDL *
if (1 == PageCount) if (1 == PageCount)
{ {
ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress); ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress);
ByteOffsetEnd0 = BYTE_OFFSET(ByteCount + (PAGE_SIZE - 1)); ByteOffsetEnd0 = BYTE_OFFSET((PUINT8)VirtualAddress + ByteCount - 1) + 1;
ByteOffsetEnd1 = 0; ByteOffsetEnd1 = 0;
Buffer0 = 0 != ByteOffsetBgn0 || PAGE_SIZE != ByteOffsetEnd0; Buffer0 = 0 != ByteOffsetBgn0 || PAGE_SIZE != ByteOffsetEnd0;
Buffer1 = FALSE; Buffer1 = FALSE;
@ -551,7 +552,7 @@ NTSTATUS FspSafeMdlCreate(PMDL UserMdl, LOCK_OPERATION Operation, FSP_SAFE_MDL *
{ {
ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress); ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress);
ByteOffsetEnd0 = PAGE_SIZE; ByteOffsetEnd0 = PAGE_SIZE;
ByteOffsetEnd1 = BYTE_OFFSET((PUINT8)VirtualAddress + ByteCount + (PAGE_SIZE - 1)); ByteOffsetEnd1 = BYTE_OFFSET((PUINT8)VirtualAddress + ByteCount - 1) + 1;
Buffer0 = 0 != ByteOffsetBgn0; Buffer0 = 0 != ByteOffsetBgn0;
Buffer1 = PAGE_SIZE != ByteOffsetEnd1; Buffer1 = PAGE_SIZE != ByteOffsetEnd1;
} }
@ -575,16 +576,16 @@ NTSTATUS FspSafeMdlCreate(PMDL UserMdl, LOCK_OPERATION Operation, FSP_SAFE_MDL *
MmBuildMdlForNonPagedPool(TempMdl); MmBuildMdlForNonPagedPool(TempMdl);
TempPfnArray = MmGetMdlPfnArray(SafeMdl); TempPfnArray = MmGetMdlPfnArray(TempMdl);
if (IoReadAccess == Operation) if (IoReadAccess == Operation)
{ {
if (Buffer0) if (Buffer0)
{ {
RtlZeroMemory((PUINT8)SafeMdl->Buffer, ByteOffsetBgn0); RtlZeroMemory((PUINT8)SafeMdl->Buffer, ByteOffsetBgn0);
RtlCopyMemory((PUINT8)SafeMdl->Buffer + ByteOffsetBgn0, RtlCopyMemory((PUINT8)SafeMdl->Buffer + ByteOffsetBgn0,
(PUINT8)VirtualAddress + ByteOffsetBgn0, ByteOffsetEnd0 - ByteOffsetBgn0); (PUINT8)VirtualAddress, ByteOffsetEnd0 - ByteOffsetBgn0);
RtlZeroMemory((PUINT8)SafeMdl->Buffer + ByteOffsetEnd0, PAGE_SIZE - ByteOffsetEnd0); RtlZeroMemory((PUINT8)SafeMdl->Buffer + ByteOffsetEnd0, PAGE_SIZE - ByteOffsetEnd0);
UserPfnArray[0] = TempPfnArray[0]; SafePfnArray[0] = TempPfnArray[0];
} }
if (Buffer1) if (Buffer1)
{ {
@ -592,16 +593,16 @@ NTSTATUS FspSafeMdlCreate(PMDL UserMdl, LOCK_OPERATION Operation, FSP_SAFE_MDL *
(PUINT8)VirtualAddress + (PageCount - 1) * PAGE_SIZE, ByteOffsetEnd1); (PUINT8)VirtualAddress + (PageCount - 1) * PAGE_SIZE, ByteOffsetEnd1);
RtlZeroMemory((PUINT8)SafeMdl->Buffer + (BufferPageCount - 1) * PAGE_SIZE + ByteOffsetEnd1, RtlZeroMemory((PUINT8)SafeMdl->Buffer + (BufferPageCount - 1) * PAGE_SIZE + ByteOffsetEnd1,
PAGE_SIZE - ByteOffsetEnd1); PAGE_SIZE - ByteOffsetEnd1);
UserPfnArray[PageCount - 1] = TempPfnArray[BufferPageCount - 1]; SafePfnArray[PageCount - 1] = TempPfnArray[BufferPageCount - 1];
} }
} }
else else
{ {
RtlZeroMemory((PUINT8)SafeMdl->Buffer, PAGE_SIZE * BufferPageCount); RtlZeroMemory((PUINT8)SafeMdl->Buffer, PAGE_SIZE * BufferPageCount);
if (Buffer0) if (Buffer0)
UserPfnArray[0] = TempPfnArray[0]; SafePfnArray[0] = TempPfnArray[0];
if (Buffer1) if (Buffer1)
UserPfnArray[PageCount - 1] = TempPfnArray[BufferPageCount - 1]; SafePfnArray[PageCount - 1] = TempPfnArray[BufferPageCount - 1];
} }
IoFreeMdl(TempMdl); IoFreeMdl(TempMdl);
@ -656,7 +657,7 @@ VOID FspSafeMdlCopyBack(FSP_SAFE_MDL *SafeMdl)
if (1 == PageCount) if (1 == PageCount)
{ {
ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress); ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress);
ByteOffsetEnd0 = BYTE_OFFSET(ByteCount + (PAGE_SIZE - 1)); ByteOffsetEnd0 = BYTE_OFFSET((PUINT8)VirtualAddress + ByteCount - 1) + 1;
ByteOffsetEnd1 = 0; ByteOffsetEnd1 = 0;
Buffer0 = 0 != ByteOffsetBgn0 || PAGE_SIZE != ByteOffsetEnd0; Buffer0 = 0 != ByteOffsetBgn0 || PAGE_SIZE != ByteOffsetEnd0;
Buffer1 = FALSE; Buffer1 = FALSE;
@ -665,7 +666,7 @@ VOID FspSafeMdlCopyBack(FSP_SAFE_MDL *SafeMdl)
{ {
ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress); ByteOffsetBgn0 = BYTE_OFFSET(VirtualAddress);
ByteOffsetEnd0 = PAGE_SIZE; ByteOffsetEnd0 = PAGE_SIZE;
ByteOffsetEnd1 = BYTE_OFFSET((PUINT8)VirtualAddress + ByteCount + (PAGE_SIZE - 1)); ByteOffsetEnd1 = BYTE_OFFSET((PUINT8)VirtualAddress + ByteCount - 1) + 1;
Buffer0 = 0 != ByteOffsetBgn0; Buffer0 = 0 != ByteOffsetBgn0;
Buffer1 = PAGE_SIZE != ByteOffsetEnd1; Buffer1 = PAGE_SIZE != ByteOffsetEnd1;
} }
@ -674,7 +675,7 @@ VOID FspSafeMdlCopyBack(FSP_SAFE_MDL *SafeMdl)
if (0 < BufferPageCount) if (0 < BufferPageCount)
{ {
if (Buffer0) if (Buffer0)
RtlCopyMemory((PUINT8)VirtualAddress + ByteOffsetBgn0, RtlCopyMemory((PUINT8)VirtualAddress,
(PUINT8)SafeMdl->Buffer + ByteOffsetBgn0, ByteOffsetEnd0 - ByteOffsetBgn0); (PUINT8)SafeMdl->Buffer + ByteOffsetBgn0, ByteOffsetEnd0 - ByteOffsetBgn0);
if (Buffer1) if (Buffer1)
RtlCopyMemory((PUINT8)VirtualAddress + (PageCount - 1) * PAGE_SIZE, RtlCopyMemory((PUINT8)VirtualAddress + (PageCount - 1) * PAGE_SIZE,

4
tst/winfsp-tests/rdwr-test.c
View File

@ -34,8 +34,8 @@ void rdwr_noncached_dotest(ULONG Flags, PWSTR VolPrefix, PWSTR Prefix, ULONG Fil
Success = GetDiskFreeSpaceW(FilePath, &SectorsPerCluster, &BytesPerSector, &FreeClusters, &TotalClusters); Success = GetDiskFreeSpaceW(FilePath, &SectorsPerCluster, &BytesPerSector, &FreeClusters, &TotalClusters);
ASSERT(Success); ASSERT(Success);
Buffer[0] = malloc(BytesPerSector); Buffer[0] = _aligned_malloc(BytesPerSector, BytesPerSector);
Buffer[1] = malloc(BytesPerSector); Buffer[1] = _aligned_malloc(BytesPerSector, BytesPerSector);
ASSERT(0 != Buffer[0] && 0 != Buffer[1]); ASSERT(0 != Buffer[0] && 0 != Buffer[1]);
srand((unsigned)time(0)); srand((unsigned)time(0));