Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tthompson] 71942: [NTFS] Implement AddRun(). Add support functions and documentation. +ConvertDataRunsToLargeMCB() +ConvertLargeMCBToDataRuns() *SetAttributeDataLength(), *NtfsWriteFile() - Update...
by tthompson＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: tthompson Date: Thu Jul 14 15:20:48 2016 New Revision: 71942 URL: http://svn.reactos.org/svn/reactos?rev=71942&view=rev Log: [NTFS] Implement AddRun(). Add support functions and documentation. +ConvertDataRunsToLargeMCB() +ConvertLargeMCBToDataRuns() *SetAttributeDataLength(), *NtfsWriteFile() - Update for AddRun() implementation. Add hack to SetAttributeDataLength() to allow notepad.exe to save files until freeing clusters is implemented. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -35,17 +35,309 @@ /* FUNCTIONS ****************************************************************/ +/** +* @name AddRun +* @implemented +* +* Adds a run of allocated clusters to a non-resident attribute. +* +* @param Vcb +* Pointer to an NTFS_VCB for the destination volume. +* +* @param AttrContext +* Pointer to an NTFS_ATTR_CONTEXT describing the destination attribute. +* +* @param AttrOffset +* Byte offset of the destination attribute relative to its file record. +* +* @param FileRecord +* Pointer to a complete copy of the file record containing the destination attribute. Must be at least +* Vcb->NtfsInfo.BytesPerFileRecord bytes long. +* +* @param NextAssignedCluster +* Logical cluster number of the start of the data run being added. +* +* @param RunLength +* How many clusters are in the data run being added. Can't be 0. +* +* @return +* STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute. +* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails. +* STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. +* STATUS_NOT_IMPLEMENTED if we need to migrate the attribute to an attribute list (TODO). +* +* @remarks +* Clusters should have been allocated previously with NtfsAllocateClusters(). +* +* +*/ NTSTATUS -AddRun(PNTFS_ATTR_CONTEXT AttrContext, +AddRun(PNTFS_VCB Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, ULONGLONG NextAssignedCluster, ULONG RunLength) { - UNIMPLEMENTED; + NTSTATUS Status; + PUCHAR DataRun = (PUCHAR)&AttrContext->Record + AttrContext->Record.NonResident.MappingPairsOffset; + int DataRunMaxLength; + PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); + LARGE_MCB DataRunsMCB; + ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN; + + // Allocate some memory for the RunBuffer + PUCHAR RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + int RunBufferOffset = 0; if (!AttrContext->Record.IsNonResident) return STATUS_INVALID_PARAMETER; - return STATUS_NOT_IMPLEMENTED; + // Convert the data runs to a map control block + Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to convert data runs to MCB (probably ran out of memory)!\n"); + return Status; + } + + // Add newly-assigned clusters to mcb + FsRtlAddLargeMcbEntry(&DataRunsMCB, + NextVBN, + NextAssignedCluster, + RunLength); + + // Convert the map control block back to encoded data runs + ConvertLargeMCBToDataRuns(&DataRunsMCB, RunBuffer, Vcb->NtfsInfo.BytesPerCluster, &RunBufferOffset); + + // Get the amount of free space between the start of the of the first data run and the attribute end + DataRunMaxLength = AttrContext->Record.Length - AttrContext->Record.NonResident.MappingPairsOffset; + + // Do we need to extend the attribute (or convert to attribute list)? + if (DataRunMaxLength < RunBufferOffset) + { + PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + NextAttributeOffset); + DataRunMaxLength += Vcb->NtfsInfo.BytesPerFileRecord - NextAttributeOffset - (sizeof(ULONG) * 2); + + // Can we move the end of the attribute? + if (NextAttribute->Type != AttributeEnd || DataRunMaxLength < RunBufferOffset - 1) + { + DPRINT1("FIXME: Need to create attribute list! Max Data Run Length available: %d\n", DataRunMaxLength); + if (NextAttribute->Type != AttributeEnd) + DPRINT1("There's another attribute after this one with type %0xlx\n", NextAttribute->Type); + ExFreePoolWithTag(RunBuffer, TAG_NTFS); + FsRtlUninitializeLargeMcb(&DataRunsMCB); + return STATUS_NOT_IMPLEMENTED; + } + + // calculate position of end markers + NextAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + RunBufferOffset; + NextAttributeOffset = ALIGN_UP_BY(NextAttributeOffset, 8); + + // Write the end markers + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + NextAttributeOffset); + NextAttribute->Type = AttributeEnd; + NextAttribute->Length = FILE_RECORD_END; + + // Update the length + DestinationAttribute->Length = NextAttributeOffset - AttrOffset; + AttrContext->Record.Length = DestinationAttribute->Length; + + // We need to increase the FileRecord size + FileRecord->BytesInUse = NextAttributeOffset + (sizeof(ULONG) * 2); + } + + // NOTE: from this point on the original attribute record will contain invalid data in it's runbuffer + // TODO: Elegant fix? Could we free the old Record and allocate a new one without issue? + + // Update HighestVCN + DestinationAttribute->NonResident.HighestVCN = + AttrContext->Record.NonResident.HighestVCN = max(NextVBN - 1 + RunLength, + AttrContext->Record.NonResident.HighestVCN); + + // Write data runs to destination attribute + RtlCopyMemory((PVOID)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), + RunBuffer, + RunBufferOffset); + + // Update the file record + Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); + + ExFreePoolWithTag(RunBuffer, TAG_NTFS); + FsRtlUninitializeLargeMcb(&DataRunsMCB); + + NtfsDumpDataRuns((PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), 0); + + return Status; +} + +/** +* @name ConvertDataRunsToLargeMCB +* @implemented +* +* Converts binary data runs to a map control block. +* +* @param DataRun +* Pointer to the run data +* +* @param DataRunsMCB +* Pointer to an unitialized LARGE_MCB structure. +* +* @return +* STATUS_SUCCESS on success, STATUS_INSUFFICIENT_RESOURCES if we fail to +* initialize the mcb or add an entry. +* +* @remarks +* Initializes the LARGE_MCB pointed to by DataRunsMCB. If this function succeeds, you +* need to call FsRtlUninitializeLargeMcb() when you're done with DataRunsMCB. This +* function will ensure the LargeMCB has been unitialized in case of failure. +* +*/ +NTSTATUS +ConvertDataRunsToLargeMCB(PUCHAR DataRun, + PLARGE_MCB DataRunsMCB, + PULONGLONG pNextVBN) +{ + LONGLONG DataRunOffset; + ULONGLONG DataRunLength; + LONGLONG DataRunStartLCN; + ULONGLONG NextCluster; + + ULONGLONG LastLCN = 0; + + // Initialize the MCB, potentially catch an exception + _SEH2_TRY{ + FsRtlInitializeLargeMcb(DataRunsMCB, NonPagedPool); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + } _SEH2_END; + + while (*DataRun != 0) + { + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + + if (DataRunOffset != -1) + { + // Normal data run. + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + NextCluster = LastLCN + DataRunLength; + + + _SEH2_TRY{ + if (!FsRtlAddLargeMcbEntry(DataRunsMCB, + *pNextVBN, + DataRunStartLCN, + DataRunLength)) + { + FsRtlUninitializeLargeMcb(DataRunsMCB); + return STATUS_INSUFFICIENT_RESOURCES; + } + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + FsRtlUninitializeLargeMcb(DataRunsMCB); + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + } _SEH2_END; + + } + + *pNextVBN += DataRunLength; + } + + return STATUS_SUCCESS; +} + +/** +* @name ConvertLargeMCBToDataRuns +* @implemented +* +* Converts a map control block to a series of encoded data runs (used by non-resident attributes). +* +* @param DataRunsMCB +* Pointer to a LARGE_MCB structure describing the data runs. +* +* @param RunBuffer +* Pointer to the buffer that will receive the encoded data runs. +* +* @param MaxBufferSize +* Size of RunBuffer, in bytes. +* +* @param UsedBufferSize +* Pointer to a ULONG that will receive the size of the data runs in bytes. Can't be NULL. +* +* @return +* STATUS_SUCCESS on success, STATUS_BUFFER_TOO_SMALL if RunBuffer is too small to contain the +* complete output. +* +*/ +NTSTATUS +ConvertLargeMCBToDataRuns(PLARGE_MCB DataRunsMCB, + PUCHAR RunBuffer, + ULONG MaxBufferSize, + PULONG UsedBufferSize) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG RunBufferOffset = 0; + LONGLONG DataRunOffset; + ULONGLONG LastLCN = 0; + + LONGLONG Vbn, Lbn, Count; + + + DPRINT("\t[Vbn, Lbn, Count]\n"); + + // convert each mcb entry to a data run + for (int i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++) + { + UCHAR DataRunOffsetSize = 0; + UCHAR DataRunLengthSize = 0; + UCHAR ControlByte = 0; + + // [vbn, lbn, count] + DPRINT("\t[%I64d, %I64d,%I64d]\n", Vbn, Lbn, Count); + + // TODO: check for holes and convert to sparse runs + DataRunOffset = Lbn - LastLCN; + LastLCN = Lbn; + + // now we need to determine how to represent DataRunOffset with the minimum number of bytes + DPRINT("Determining how many bytes needed to represent %I64x\n", DataRunOffset); + DataRunOffsetSize = GetPackedByteCount(DataRunOffset, TRUE); + DPRINT("%d bytes needed.\n", DataRunOffsetSize); + + // determine how to represent DataRunLengthSize with the minimum number of bytes + DPRINT("Determining how many bytes needed to represent %I64x\n", Count); + DataRunLengthSize = GetPackedByteCount(Count, TRUE); + DPRINT("%d bytes needed.\n", DataRunLengthSize); + + // ensure the next data run + end marker would be > Max buffer size + if (RunBufferOffset + 2 + DataRunLengthSize + DataRunOffsetSize > MaxBufferSize) + { + Status = STATUS_BUFFER_TOO_SMALL; + DPRINT1("FIXME: Ran out of room in buffer for data runs!\n"); + break; + } + + // pack and copy the control byte + ControlByte = (DataRunOffsetSize << 4) + DataRunLengthSize; + RunBuffer[RunBufferOffset++] = ControlByte; + + // copy DataRunLength + RtlCopyMemory(RunBuffer + RunBufferOffset, &Count, DataRunLengthSize); + RunBufferOffset += DataRunLengthSize; + + // copy DataRunOffset + RtlCopyMemory(RunBuffer + RunBufferOffset, &DataRunOffset, DataRunOffsetSize); + RunBufferOffset += DataRunOffsetSize; + } + + // End of data runs + RunBuffer[RunBufferOffset++] = 0; + + *UsedBufferSize = RunBufferOffset; + DPRINT("New Size of DataRuns: %ld\n", *UsedBufferSize); + + return Status; } PUCHAR Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -211,6 +211,11 @@ FileRecord->BytesInUse = NextAttributeOffset + (sizeof(ULONG) * 2); } +/** +* @parameter FileRecord +* Pointer to a file record. Must be a full record at least +* Fcb->Vcb->NtfsInfo.BytesPerFileRecord bytes large, not just the header. +*/ NTSTATUS SetAttributeDataLength(PFILE_OBJECT FileObject, PNTFS_FCB Fcb, @@ -235,6 +240,7 @@ { ULONG BytesPerCluster = Fcb->Vcb->NtfsInfo.BytesPerCluster; ULONGLONG AllocationSize = ROUND_UP(DataSize->QuadPart, BytesPerCluster); + PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); // do we need to increase the allocation size? if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) @@ -265,7 +271,7 @@ } // now we need to add the clusters we allocated to the data run - Status = AddRun(AttrContext, NextAssignedCluster, AssignedClusters); + Status = AddRun(Fcb->Vcb, AttrContext, AttrOffset, FileRecord, NextAssignedCluster, AssignedClusters); if (!NT_SUCCESS(Status)) { DPRINT1("Error: Unable to add data run!\n"); @@ -275,23 +281,34 @@ ClustersNeeded -= AssignedClusters; LastClusterInDataRun.LowPart = NextAssignedCluster + AssignedClusters - 1; } - - DPRINT1("FixMe: Increasing allocation size is unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; + } + else if (AttrContext->Record.NonResident.AllocatedSize > AllocationSize) + { + // shrink allocation size (TODO) + if (AllocationSize == 0) + { + // hack for notepad.exe + PUCHAR DataRuns = (PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset); + *DataRuns = 0; + DestinationAttribute->NonResident.HighestVCN = + AttrContext->Record.NonResident.HighestVCN = 0; + } } // TODO: is the file compressed, encrypted, or sparse? // NOTE: we need to have acquired the main resource exclusively, as well as(?) the PagingIoResource - // TODO: update the allocated size on-disk - DPRINT("Allocated Size: %I64u\n", AttrContext->Record.NonResident.AllocatedSize); - + Fcb->RFCB.AllocationSize.QuadPart = AllocationSize; + AttrContext->Record.NonResident.AllocatedSize = AllocationSize; AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; - // copy the attribute record back into the FileRecord - RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); + DestinationAttribute->NonResident.AllocatedSize = AllocationSize; + DestinationAttribute->NonResident.DataSize = DataSize->QuadPart; + DestinationAttribute->NonResident.InitializedSize = DataSize->QuadPart; + + DPRINT("Allocated Size: %I64u\n", DestinationAttribute->NonResident.AllocatedSize); } else { Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -517,9 +517,23 @@ //NtfsDumpAttribute(PATTRIBUTE Attribute); NTSTATUS -AddRun(PNTFS_ATTR_CONTEXT AttrContext, +AddRun(PNTFS_VCB Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, ULONGLONG NextAssignedCluster, ULONG RunLength); + +NTSTATUS +ConvertDataRunsToLargeMCB(PUCHAR DataRun, + PLARGE_MCB DataRunsMCB, + PULONGLONG pNextVBN); + +NTSTATUS +ConvertLargeMCBToDataRuns(PLARGE_MCB DataRunsMCB, + PUCHAR RunBuffer, + ULONG MaxBufferSize, + PULONG UsedBufferSize); PUCHAR DecodeRun(PUCHAR DataRun, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Thu Jul 14 15:20:48 2016 @@ -429,6 +429,22 @@ return Status; } + // at this point the record in DataContext may be stale, so we need to refresh it + ReleaseAttributeContext(DataContext); + + Status = FindAttribute(DeviceExt, + FileRecord, + AttributeData, + Fcb->Stream, + wcslen(Fcb->Stream), + &DataContext, + &AttributeOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("DRIVER ERROR: Couldn't find $DATA attribute after setting size!\n"); + return Status; + } + // now we need to update this file's size in every directory index entry that references it // TODO: put this code in its own function and adapt it to work with every filename / hardlink // stored in the file record.

1 0

[pschweitzer] 71941: [BOOTLIB] Fix checksum computation CID #1363451
by pschweitzer＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: pschweitzer Date: Thu Jul 14 13:04:08 2016 New Revision: 71941 URL: http://svn.reactos.org/svn/reactos?rev=71941&view=rev Log: [BOOTLIB] Fix checksum computation CID #1363451 Modified: trunk/reactos/boot/environ/lib/misc/util.c Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Thu Jul 14 13:04:08 2016 @@ -749,7 +749,7 @@ } } - if (Length != Length) + if (i != Length) { PartialSum += (unsigned __int8)Buffer[Length]; if (Flags & BL_UTL_CHECKSUM_COMPLEMENT)

1 0

[pschweitzer] 71940: [BOOTLIB] Fix out of bounds read. CID #1363549
by pschweitzer＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: pschweitzer Date: Thu Jul 14 12:58:29 2016 New Revision: 71940 URL: http://svn.reactos.org/svn/reactos?rev=71940&view=rev Log: [BOOTLIB] Fix out of bounds read. CID #1363549 Modified: trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Thu Jul 14 12:58:29 2016 @@ -778,8 +778,7 @@ (&SubObjectList[i])->Data4[4], (&SubObjectList[i])->Data4[5], (&SubObjectList[i])->Data4[6], - (&SubObjectList[i])->Data4[7], - (&SubObjectList[i])->Data4[8]); + (&SubObjectList[i])->Data4[7]); Status = STATUS_SUCCESS; } }

1 0

[pschweitzer] 71939: [BOOTMGR] Don't use uninit var. CID #1363650
by pschweitzer＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: pschweitzer Date: Thu Jul 14 12:46:31 2016 New Revision: 71939 URL: http://svn.reactos.org/svn/reactos?rev=71939&view=rev Log: [BOOTMGR] Don't use uninit var. CID #1363650 Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Thu Jul 14 12:46:31 2016 @@ -1470,7 +1470,7 @@ ) { PBL_LOADED_APPLICATION_ENTRY* Sequence; - ULONG Count; + ULONG Count = SequenceListCount; NTSTATUS Status; /* Allocate the sequence list */

1 0

[pschweitzer] 71938: [BOOTLIB] Don't deal with uninit ptr. CID #1363698
by pschweitzer＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: pschweitzer Date: Thu Jul 14 12:40:17 2016 New Revision: 71938 URL: http://svn.reactos.org/svn/reactos?rev=71938&view=rev Log: [BOOTLIB] Don't deal with uninit ptr. CID #1363698 Modified: trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Thu Jul 14 12:40:17 2016 @@ -1309,6 +1309,7 @@ DeviceId = -1; Device = NULL; ImageAppEntry = NULL; + AppEntry = NULL; Path = NULL; ImageSize = 0; ImageBase = NULL;

1 0

[pschweitzer] 71937: [NTOSKRNL] Assert that the allocated buffers are not leaked. CID #1248416
by pschweitzer＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: pschweitzer Date: Thu Jul 14 12:21:57 2016 New Revision: 71937 URL: http://svn.reactos.org/svn/reactos?rev=71937&view=rev Log: [NTOSKRNL] Assert that the allocated buffers are not leaked. CID #1248416 Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Thu Jul 14 12:21:57 2016 @@ -134,6 +134,8 @@ StarFound++; if (StarFound >= BackTrackingSize) { + ASSERT(BackTracking == BackTrackingBuffer); + BackTrackingSize = Expression->Length / sizeof(WCHAR); BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, BackTrackingSize * sizeof(USHORT), @@ -190,6 +192,8 @@ DosStarFound++; if (DosStarFound >= DosBackTrackingSize) { + ASSERT(DosBackTracking == DosBackTrackingBuffer); + DosBackTrackingSize = Expression->Length / sizeof(WCHAR); DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, DosBackTrackingSize * sizeof(USHORT),

1 0

[pschweitzer] 71936: [MUP] Don't deal with uninit ptr. CID #1322222
by pschweitzer＠svn.reactos.org 14 Jul '16

14 Jul '16

Author: pschweitzer Date: Thu Jul 14 12:07:05 2016 New Revision: 71936 URL: http://svn.reactos.org/svn/reactos?rev=71936&view=rev Log: [MUP] Don't deal with uninit ptr. CID #1322222 Modified: trunk/reactos/drivers/filesystems/mup/mup.c Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Thu Jul 14 12:07:05 2016 @@ -1385,9 +1385,9 @@ BroadcastOpen(PIRP Irp) { PMUP_FCB Fcb; - PMUP_CCB Ccb; HANDLE Handle; PLIST_ENTRY Entry; + PMUP_CCB Ccb = NULL; PMUP_UNC UncProvider; UNICODE_STRING FullPath; PFILE_OBJECT FileObject;

1 0

[zhu] 71935: Changed test programs. Server now echoes messages sent by client, and client is now multi-threaded. Modified spinlocks to serialize access to metadata as well as linked lists. Very ine...
by zhu＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: zhu Date: Wed Jul 13 21:01:53 2016 New Revision: 71935 URL: http://svn.reactos.org/svn/reactos?rev=71935&view=rev Log: Changed test programs. Server now echoes messages sent by client, and client is now multi-threaded. Modified spinlocks to serialize access to metadata as well as linked lists. Very inefficient, and does not pass my own test bench right now. Defined and wrote initialization code for global variables intended solely as debugging aids. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] Wed Jul 13 21:01:53 2016 @@ -2,48 +2,106 @@ #include <stdio.h> #include <winsock2.h> +#define LENGTH 255 +#define NUM_CLIENTS 4 + +DWORD WINAPI ClientThreadMain(LPVOID lpParam) { + SOCKET Sock; + + struct sockaddr_in ServerAddr; + + char buff[LENGTH]; + + int self; + int ret; + int len; + + self = (int)lpParam; + + printf("Client %d startup\n", self); + + Sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (Sock == INVALID_SOCKET) { + printf("Client %d failed to create socket: %d\n", self, WSAGetLastError()); + return 1; + } + + ServerAddr.sin_family = AF_INET; + ServerAddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ServerAddr.sin_port = htons(10000); + + ret = connect(Sock, (struct sockaddr *)&ServerAddr, sizeof(struct sockaddr_in)); + if (ret == SOCKET_ERROR) { + printf("Client %d failed to connect: %d\n", self, WSAGetLastError()); + closesocket(Sock); + return 1; + } + + sprintf(buff, "Client %d pinging server", self); + len = strlen(buff); + ret = send(Sock, buff, len, 0); + if (ret != len) { + printf("Client %d failed to send properly. Should send %d bytes, send() returned %d\n WSA Error: %d\n", + self, len, ret, WSAGetLastError()); + closesocket(Sock); + return 1; + } + + ret = recv(Sock, buff, LENGTH, 0); + buff[LENGTH - 1] = '\0'; + if (ret <= 0) { + printf("Client %d received no response from server: %d\n", self, WSAGetLastError()); + } + else { + printf("Client %d received %d-byte response from server:\n %s\n", + self, ret, buff); + } + + closesocket(Sock); + + printf("Client %d exit\n", self); + + return 0; +} + int wmain(int argc, LPWSTR argv[]) { - WSADATA wsa; - SOCKET sock; - struct sockaddr_in server; + WSADATA wsa; + HANDLE ClientThreadHandles[NUM_CLIENTS]; + DWORD ClientThreadIDs[NUM_CLIENTS]; - int ret; - - char buff[256]; + char buff[LENGTH]; - ret = WSAStartup(MAKEWORD(2, 2), &wsa); - if (ret != 0) { - printf("Windows Socket API Startup Failed: %d", WSAGetLastError()); - return 1; - } + int ret; + int i; - printf("Attempt socket creation\n"); - fgets(&buff[0], 255, stdin); - sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock == INVALID_SOCKET) { - printf("Socket Creation Failed: %d", WSAGetLastError()); - return 1; - } - - server.sin_addr.s_addr = inet_addr("127.0.0.1"); - server.sin_family = AF_INET; - server.sin_port = htons(10000); + ret = WSAStartup(MAKEWORD(2, 2), &wsa); + if (ret != 0) { + printf("Windows Socket API Startup Failed: %d\n", WSAGetLastError()); + return 1; + } - printf("Attempt connect\n"); - fgets(&buff[0], 255, stdin); - ret = connect(sock, (struct sockaddr *)&server, sizeof(server)); - if (ret < 0) { - printf("Socket Connection Failed: %d", WSAGetLastError()); - return 1; - } + for (i = 0; i < NUM_CLIENTS; i++) { + ClientThreadHandles[i] = CreateThread( + NULL, + 0, + ClientThreadMain, + (LPVOID)i, + 0, + &ClientThreadIDs[i]); - printf("Connected\n"); + if (ClientThreadHandles[i] == NULL) { + printf("Thread %d failed to spawn\n", i); + return 1; + } + } - fgets(&buff[0], 255, stdin); - ret = send(sock, &buff[0], 256, MSG_OOB); - printf("Sent %d bytes", ret); - - fgets(&buff[0], 255, stdin); - - return 0; + WaitForMultipleObjects(NUM_CLIENTS, ClientThreadHandles, TRUE, INFINITE); + + for (i = 0; i < NUM_CLIENTS; i++) { + CloseHandle(ClientThreadHandles[i]); + } + + fgets(buff, LENGTH, stdin); + + return 0; } Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] Wed Jul 13 21:01:53 2016 @@ -1,73 +1,105 @@ #include <stdio.h> #include <WinSock2.h> +#define backlog 4 +#define LENGTH 256 + int wmain(int argc, LPWSTR argv[]) { WSADATA wsa; - SOCKET sock; - SOCKET accepted; - struct sockaddr_in server; - struct sockaddr_in client; + SOCKET ListenSock; + SOCKET ClientSock; - int c; + struct sockaddr_in ListenAddr; + struct sockaddr_in ClientAddr; + + char buff[LENGTH]; + int ret; - - char buff[256]; + int addrSize; + int count; - memset(&server, 0, sizeof(struct sockaddr_in)); - memset(&client, 0, sizeof(struct sockaddr_in)); + printf("Server startup\n"); ret = WSAStartup(MAKEWORD(2, 2), &wsa); if (ret != 0) { - printf("Windows Socket API Startup Failed: %d", WSAGetLastError()); - exit(1); + printf("Windows Socket API Startup Failed: %d\n", WSAGetLastError()); + fgets(buff, LENGTH, stdin); + return 1; } - printf("Attempt socket creation\n"); - fgets(&buff[0], 255, stdin); - sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock == INVALID_SOCKET) { - printf("Socket Creation Failed: %d", WSAGetLastError()); - exit(1); - } + memset(&ListenAddr, 0, sizeof(struct sockaddr_in)); + ListenAddr.sin_family = AF_INET; + ListenAddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ListenAddr.sin_port = htons(10000); - server.sin_family = AF_INET; - server.sin_addr.s_addr = inet_addr("127.0.0.1"); - server.sin_port = htons(10000); - - printf("Attempt bind\n"); - fgets(&buff[0], 255, stdin); - ret = bind(sock, (struct sockaddr *)&server, sizeof(server)); - if (ret == SOCKET_ERROR) { - printf("Socket Bind Failed: %d", WSAGetLastError()); - exit(1); - } + ListenSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (ListenSock == INVALID_SOCKET) { + printf("Socket creation failed: %d\n", WSAGetLastError()); + WSACleanup(); + fgets(buff, LENGTH, stdin); + return 1; + } + printf("Server listening socket created\n"); - printf("Attempt listen\n"); - fgets(&buff[0], 255, stdin); - ret = listen(sock, 3); - if (ret != 0) { - printf("Socket Listen Failed: %d", WSAGetLastError()); - exit(1); - } + ret = bind(ListenSock, (struct sockaddr *)&ListenAddr, sizeof(ListenAddr)); + if (ret == SOCKET_ERROR) { + printf("Bind failed: %d\n", WSAGetLastError()); + closesocket(ListenSock); + WSACleanup(); + fgets(buff, LENGTH, stdin); + return 1; + } + printf("Server listening socket bound\n"); - printf("Listening for connections on LOOPBACK port 10000\n"); - - c = sizeof(struct sockaddr_in); + ret = listen(ListenSock, backlog); + if (ret == SOCKET_ERROR) { + printf("Listen failed: %d\n", WSAGetLastError()); + closesocket(ListenSock); + WSACleanup(); + fgets(buff, LENGTH, stdin); + return 1; + } + printf("Server listening socket is now listening\n"); - printf("Enter accept loop\n"); - fgets(&buff[0], 255, stdin); - while(1) { - accepted = accept(sock, (struct sockaddr *)&client, &c); - if (accepted == INVALID_SOCKET) { - printf("Socket Connection Acceptance Failed: %d", WSAGetLastError()); - exit(1); - } else { - printf("Socket connection accepted\n"); - ret = recv(accepted, &buff[0], 256, 0); - printf("Received %d bytes\n", ret); - printf("Message: %s", &buff[0]); - } - } + count = 0; + // Only a single server handler for now. + while (1) { + addrSize = sizeof(struct sockaddr_in); + memset(buff, 0, sizeof(buff)); + printf("\nWaiting to accept connection %d\n", count); + ClientSock = accept(ListenSock, (struct sockaddr *)&ClientAddr, &addrSize); + if (ClientSock == INVALID_SOCKET) { + printf("Accept failed: %d\n", WSAGetLastError()); + closesocket(ListenSock); + WSACleanup(); + fgets(buff, LENGTH, stdin); + return 1; + } + printf("Connection established to client %d\n", count); - exit(1); + ret = recv(ClientSock, buff, LENGTH, 0); + buff[LENGTH - 1] = '\0'; + printf(" Received %d-byte message from client %d: %s\n", ret, count, buff); + + ret = send(ClientSock, buff, ret, 0); + if (ret == SOCKET_ERROR) { + printf("Send failed: %d\n", WSAGetLastError()); + closesocket(ListenSock); + closesocket(ClientSock); + WSACleanup(); + fgets(buff, LENGTH, stdin); + return 1; + } + printf("Message echoed\n"); + + closesocket(ClientSock); + + count++; + } + + printf("Server exit\n"); + + fgets(buff, LENGTH, stdin); + + return 0; } Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Wed Jul 13 21:01:53 2016 @@ -11,6 +11,13 @@ #include <debug.h> volatile long int PcbCount; +volatile long int AddrFileCount; +volatile long int ContextCount; + +struct tcp_pcb *PCBList[128]; +PADDRESS_FILE AddrFileList[128]; +PTCP_CONTEXT ContextList[128]; + typedef struct { @@ -197,6 +204,12 @@ InitializeListHead(&AddressListHead); PcbCount = 0; + AddrFileCount = 0; + ContextCount = 0; + + RtlZeroMemory(PCBList, sizeof(PCBList)); + RtlZeroMemory(AddrFileList, sizeof(AddrFileList)); + RtlZeroMemory(ContextList, sizeof(ContextList)); } static @@ -297,8 +310,6 @@ ExFreePoolWithTag(Request, TAG_TCP_REQUEST); } - KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); - if (Context->lwip_tcp_pcb != AddressFile->lwip_tcp_pcb) { tcp_arg(Context->lwip_tcp_pcb, NULL); @@ -307,6 +318,8 @@ DPRINT1("\n PCB Count\n", PcbCount); } Context->lwip_tcp_pcb = NULL; + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); Entry = Entry->Flink; } @@ -339,14 +352,14 @@ ExFreePoolWithTag(Request, TAG_TCP_REQUEST); } - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); - if (Context->AddressFile && (Context->lwip_tcp_pcb == Context->AddressFile->lwip_tcp_pcb)) { Context->AddressFile->lwip_tcp_pcb = NULL; } Context->lwip_tcp_pcb = NULL; + + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return; default : @@ -476,9 +489,9 @@ while (Entry != Head) { Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); if (Context->TcpState == TCP_STATE_LISTENING) { - KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); Context->lwip_tcp_pcb = newpcb; tcp_err(Context->lwip_tcp_pcb, lwip_tcp_err_callback); @@ -534,6 +547,7 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return ERR_OK; } + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); Entry = Entry->Flink; } @@ -674,11 +688,12 @@ }*/ Context = (PTCP_CONTEXT)arg; + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); if (!(Context->TcpState & TCP_STATE_RECEIVING)) { DPRINT1("Receive callback on connection that is not currently receiving\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return ERR_ARG; } - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); Head = &Context->RequestListHead; Entry = Head->Flink; Irp = NULL; @@ -879,13 +894,13 @@ return ERR_ARG; } Entry = RemoveHeadList(Head); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return ERR_ABRT; } IoSetCancelRoutine(Irp, NULL); @@ -893,14 +908,18 @@ if (Context->TcpState != TCP_STATE_CONNECTING) { DPRINT1("Invalid TCP state: %d\n", Context->TcpState); - lwip_err = ERR_ABRT; - goto FINISH; + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return ERR_ABRT; } Context->TcpState = TCP_STATE_CONNECTED; + + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + lwip_err = ERR_OK; -FINISH: ExFreePoolWithTag(Request, TAG_TCP_REQUEST); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -1126,6 +1145,7 @@ /* Lock the global address list */ KeAcquireSpinLock(&AddressListLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&AddressFile->ContextListLock); InterlockedDecrement(&AddressFile->RefCount); if (AddressFile->RefCount != 0) @@ -1147,6 +1167,7 @@ { DPRINT1("Calling close on TCP address with open contexts\n"); // Should never happen due to how callers are written. + KeReleaseSpinLockFromDpcLevel(&AddressFile->ContextListLock); KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_PARAMETER; } @@ -1189,11 +1210,13 @@ /* Remove from the list and free the structure */ RemoveEntryList(&AddressFile->ListEntry); + RemoveEntityInstance(&AddressFile->Instance); + + KeReleaseSpinLockFromDpcLevel(&AddressFile->ContextListLock); + + ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); + KeReleaseSpinLock(&AddressListLock, OldIrql); - - RemoveEntityInstance(&AddressFile->Instance); - - ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); return Status; } @@ -1212,21 +1235,28 @@ PIO_STACK_LOCATION IrpSp; KIRQL OldIrql; + NTSTATUS Status; + + AddressFile = Context->AddressFile; + + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); if (Context->Protocol != IPPROTO_TCP) { DPRINT1("Invalid protocol\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_INVALID_PARAMETER; } if (!(Context->TcpState & TCP_STATE_DISASSOCIATED)) { DPRINT1("Context retains association\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_UNSUCCESSFUL; } - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); - - AddressFile = Context->AddressFile; if (Context->lwip_tcp_pcb == AddressFile->lwip_tcp_pcb) { Context->lwip_tcp_pcb = NULL; @@ -1254,7 +1284,8 @@ if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_UNSUCCESSFUL; } } @@ -1271,28 +1302,36 @@ if (IrpSp->FileObject->FsContext != Context) { DPRINT1("IRP context mismatch\n"); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_UNSUCCESSFUL; } DPRINT1("Unexpected outstanding request on context\n"); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_UNSUCCESSFUL; } Entry = Entry->Flink; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); } - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); if (AddressFile->ContextCount == 0) { - return TcpIpCloseAddress(AddressFile); - } - - return STATUS_SUCCESS; + Status = TcpIpCloseAddress(AddressFile); + } + else + { + Status = STATUS_SUCCESS; + } + + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + return Status; } static @@ -1393,14 +1432,17 @@ } Context = IrpSp->FileObject->FsContext; + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); if (Context->AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_CONNECT for a non-TCP protocol\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_INVALID_ADDRESS; } if (Context->TcpState != TCP_STATE_BOUND) { DPRINT1("Connecting on address that's not bound\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_INVALID_ADDRESS; } @@ -1420,17 +1462,20 @@ case (ERR_VAL) : { DPRINT1("lwip ERR_VAL\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_INVALID_PARAMETER; } case (ERR_ISCONN) : { DPRINT1("lwip ERR_ISCONN\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_CONNECTION_ACTIVE; } case (ERR_RTE) : { /* several errors look right here */ DPRINT1("lwip ERR_RTE\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_NETWORK_UNREACHABLE; } case (ERR_BUF) : @@ -1438,22 +1483,24 @@ /* use correct error once NDIS errors are included this return value means local port unavailable */ DPRINT1("lwip ERR_BUF\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_ADDRESS_ALREADY_EXISTS; } case (ERR_USE) : { /* STATUS_CONNECTION_ACTIVE maybe? */ DPRINT1("lwip ERR_USE\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_ADDRESS_ALREADY_EXISTS; } case (ERR_MEM) : { DPRINT1("lwip ERR_MEM\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_NO_MEMORY; } case (ERR_OK) : { - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, CancelRequestRoutine, @@ -1468,6 +1515,7 @@ { /* unknown return value */ DPRINT1("lwip unknown return code\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_NOT_IMPLEMENTED; } } @@ -1489,21 +1537,6 @@ KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); - - if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) - { - DPRINT1("Associating something that is not a TDI_CONNECTION_FILE\n"); - Status = STATUS_INVALID_PARAMETER; - goto LEAVE; - } - Context = IrpSp->FileObject->FsContext; - - if (Context->lwip_tcp_pcb || Context->Protocol != IPPROTO_TCP) - { - DPRINT1("Connection context is not a new TCP context\n"); - Status = STATUS_INVALID_PARAMETER; - goto LEAVE; - } /* Get address file */ RequestInfo = (PTDI_REQUEST_KERNEL_ASSOCIATE)&IrpSp->Parameters; @@ -1528,20 +1561,35 @@ return STATUS_INVALID_PARAMETER; } AddressFile = FileObject->FsContext; + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); if (AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("TCP socket association with non-TCP handle\n"); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } - if (AddressFile->Address.in_addr == 0) { // TODO: should really look through address file list for an interface AddressFile->Address.in_addr = 0x0100007f; } - KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) + { + DPRINT1("Associating something that is not a TDI_CONNECTION_FILE\n"); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + return STATUS_INVALID_PARAMETER; + } + Context = IrpSp->FileObject->FsContext; + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + if (Context->lwip_tcp_pcb || Context->Protocol != IPPROTO_TCP) + { + DPRINT1("Connection context is not a new TCP context\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + return STATUS_INVALID_PARAMETER; + } Context->AddressFile = AddressFile; InsertTailList(&AddressFile->ContextListHead, @@ -1596,6 +1644,7 @@ Context->TcpState = TCP_STATE_BOUND; LEAVE: + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return Status; @@ -1625,14 +1674,21 @@ Context = IrpSp->FileObject->FsContext; AddressFile = Context->AddressFile; + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + if (AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_DISASSOCIATE_ADDRESS for non-TCP protocol\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_INVALID_ADDRESS; } if (Context->Protocol != IPPROTO_TCP) { DPRINT1("Address File and Context have mismatching protocols\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_INVALID_ADDRESS; } @@ -1641,7 +1697,6 @@ Context->lwip_tcp_pcb = NULL; } - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); if (!(IsListEmpty(&Context->RequestListHead))) { DPRINT1("Disassociating context with outstanding requests\n"); @@ -1658,12 +1713,12 @@ } } } - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); - - KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + RemoveEntryList(&Context->ListEntry); AddressFile->ContextCount--; Context->TcpState |= TCP_STATE_DISASSOCIATED; + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_SUCCESS; @@ -1691,16 +1746,18 @@ } /* Get context file */ Context = IrpSp->FileObject->FsContext; + AddressFile = Context->AddressFile; + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); if (!(Context->TcpState & TCP_STATE_BOUND)) { DPRINT1("Received TDI_LISTEN for a context that has not been associated\n"); // TODO: better return code + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_UNSUCCESSFUL; } - AddressFile = Context->AddressFile; - - KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); if (AddressFile->ContextListHead.Flink == &Context->ListEntry) { lpcb = tcp_listen(Context->lwip_tcp_pcb); @@ -1712,22 +1769,22 @@ either INVALID_ADDRESS or NO_MEMORY if SO_REUSE is enabled in lwip options */ DPRINT1("lwip tcp_listen error\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_INVALID_ADDRESS; } tcp_arg(lpcb, AddressFile); tcp_accept(lpcb, lwip_tcp_accept_callback); } - KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); - - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + PrepareIrpForCancel( Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE, TCP_REQUEST_PENDING_GENERAL); Context->TcpState = TCP_STATE_LISTENING; - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); return STATUS_PENDING; } @@ -1757,16 +1814,19 @@ return STATUS_INVALID_PARAMETER; } Context = IrpSp->FileObject->FsContext; + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); if (!(Context->TcpState & (TCP_STATE_ACCEPTED|TCP_STATE_CONNECTED))) { DPRINT1("Invalid TCP state: %d\n", Context->TcpState); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); // TODO: better return code return STATUS_UNSUCCESSFUL; } if (!Irp->MdlAddress) { DPRINT1("TcpIpSend Empty\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_INVALID_PARAMETER; } NdisQueryBuffer(Irp->MdlAddress, &Buffer, &Len); @@ -1774,10 +1834,9 @@ if (!Context->lwip_tcp_pcb) { DPRINT1("TcpIpSend with no lwIP tcp_pcb\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_INVALID_PARAMETER; } - - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); Head = &Context->RequestListHead; Entry = Head->Flink; @@ -1853,14 +1912,13 @@ return STATUS_INVALID_PARAMETER; } Context = IrpSp->FileObject->FsContext; + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); //DPRINT1("Receive Context Address: %08x\n", Context); //DPRINT1("Receive Address File Address: %08x\n", Context->AddressFile); if (Context->TcpState & (TCP_STATE_CONNECTED|TCP_STATE_ACCEPTED)) { RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; //DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); - - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, @@ -1878,6 +1936,7 @@ KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); DPRINT1("Invalid TCP state: %d\n", Context->TcpState); // TODO: better return error return STATUS_UNSUCCESSFUL;

1 0

[mjansen] 71934: [ACPPAGE] Remove unused var. CID 1363705
by mjansen＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: mjansen Date: Wed Jul 13 18:44:51 2016 New Revision: 71934 URL: http://svn.reactos.org/svn/reactos?rev=71934&view=rev Log: [ACPPAGE] Remove unused var. CID 1363705 Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp [iso-8859-1] Wed Jul 13 18:44:51 2016 @@ -53,7 +53,6 @@ protected: CComBSTR m_Filename; - HWND m_Wnd; BOOL m_IsSfcProtected; BOOL m_AllowPermLayer; DWORD m_LayerQueryFlags;

1 0

[mjansen] 71933: [RAPPS_NEW] Use the actual buffer size instead of hardcoding a random number. CID 1363551
by mjansen＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: mjansen Date: Wed Jul 13 18:33:42 2016 New Revision: 71933 URL: http://svn.reactos.org/svn/reactos?rev=71933&view=rev Log: [RAPPS_NEW] Use the actual buffer size instead of hardcoding a random number. CID 1363551 Modified: trunk/reactos/base/applications/rapps_new/available.cpp Modified: trunk/reactos/base/applications/rapps_new/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/available.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/available.cpp [iso-8859-1] Wed Jul 13 18:33:42 2016 @@ -18,11 +18,11 @@ } \ #define GET_STRING1(a, b) \ - if (!ParserGetString(a, b, MAX_PATH, FindFileData.cFileName)) \ + if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \ continue; #define GET_STRING2(a, b) \ - if (!ParserGetString(a, b, MAX_PATH, FindFileData.cFileName)) \ + if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \ b[0] = '\0'; LIST_ENTRY CachedEntriesHead = { &CachedEntriesHead, &CachedEntriesHead };

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