Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTFS] - Add some fixes and improvements to mft.c from CR-123:

Browse source 
FindAttribute() - Use * sizeof(WCHAR) in place bit-shifting wizardry.
IncreaseMftSize() - Remove two useless casts. Return error code if WriteAttribute() fails.
SetNonResidentAttributeDataLength() - Assert that AttrContext parameter describes a NonResident attribute. When migrating a resident attribute to non-resident, don't leak memory if FsRtlInitializeLargeMcb() throws an exception, and don't mark the attribute as non-resident until after the Mcb is initialized.
InternalSetResidentAttributeLength() and SetResidentAttributeLength() - Assert that AttrContext parameter describes a resident attribute.
AddNewMftEntry() - Simplify math of backing up and restoring reserved bits by changing BitmapData to PUCHAR type. Don't attempt to modify a volume with more than 2^32 clusters.
AddFixupArray() - Use ULONG in place of int.

svn path=/branches/GSoC_2016/NTFS/; revision=75284
This commit is contained in:
Trevor Thompson 2017-07-05 05:09:51 +00:00 committed by Thomas Faber
parent 34696e49fc
commit 68a48b2758
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
drivers/filesystems/ntfs/mft.c
View file

@ -133,7 +133,7 @@ FindAttribute(PDEVICE_EXTENSION Vcb,
AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset); AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset);
DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name); DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name);
if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) if (RtlCompareMemory(AttrName, Name, NameLength * sizeof(WCHAR)) == (NameLength * sizeof(WCHAR)))
{ {
Found = TRUE; Found = TRUE;
} }
@ -268,7 +268,7 @@ IncreaseMftSize(PDEVICE_EXTENSION Vcb, BOOLEAN CanWait)
} }
// Zero the bytes we'll be adding // Zero the bytes we'll be adding
RtlZeroMemory((PUCHAR)((ULONG_PTR)BitmapBuffer), NewBitmapSize); RtlZeroMemory(BitmapBuffer, NewBitmapSize);
// Read the bitmap attribute // Read the bitmap attribute
BytesRead = ReadAttribute(Vcb, BytesRead = ReadAttribute(Vcb,
@ -337,6 +337,7 @@ IncreaseMftSize(PDEVICE_EXTENSION Vcb, BOOLEAN CanWait)
ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); ExFreePoolWithTag(BitmapBuffer, TAG_NTFS);
ReleaseAttributeContext(BitmapContext); ReleaseAttributeContext(BitmapContext);
DPRINT1("ERROR: Couldn't write to bitmap attribute of $MFT!\n"); DPRINT1("ERROR: Couldn't write to bitmap attribute of $MFT!\n");
return Status;
} }
// Cleanup // Cleanup
@ -358,6 +359,8 @@ InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext,
DPRINT("InternalSetResidentAttributeLength( %p, %p, %lu, %lu )\n", AttrContext, FileRecord, AttrOffset, DataSize); DPRINT("InternalSetResidentAttributeLength( %p, %p, %lu, %lu )\n", AttrContext, FileRecord, AttrOffset, DataSize);
ASSERT(!AttrContext->Record.IsNonResident);
// update ValueLength Field // update ValueLength Field
AttrContext->Record.Resident.ValueLength = AttrContext->Record.Resident.ValueLength =
Destination->Resident.ValueLength = DataSize; Destination->Resident.ValueLength = DataSize;
@ -537,11 +540,7 @@ SetNonResidentAttributeDataLength(PDEVICE_EXTENSION Vcb,
PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset);
ULONG ExistingClusters = AttrContext->Record.NonResident.AllocatedSize / BytesPerCluster; ULONG ExistingClusters = AttrContext->Record.NonResident.AllocatedSize / BytesPerCluster;
if (!AttrContext->Record.IsNonResident) ASSERT(AttrContext->Record.IsNonResident);
{
DPRINT1("ERROR: SetNonResidentAttributeDataLength() called for resident attribute!\n");
return STATUS_INVALID_PARAMETER;
}
// do we need to increase the allocation size? // do we need to increase the allocation size?
if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize)
@ -671,11 +670,7 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb,
ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length;
PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset);
if (AttrContext->Record.IsNonResident) ASSERT(!AttrContext->Record.IsNonResident);
{
DPRINT1("ERROR: SetResidentAttributeDataLength() called for non-resident attribute!\n");
return STATUS_INVALID_PARAMETER;
}
//NtfsDumpFileAttributes(Vcb, FileRecord); //NtfsDumpFileAttributes(Vcb, FileRecord);
@ -733,9 +728,6 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb,
// update the mapping pairs offset, which will be 0x40 + length in bytes of the name // update the mapping pairs offset, which will be 0x40 + length in bytes of the name
AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2); AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2);
// mark the attribute as non-resident
AttrContext->Record.IsNonResident = Destination->IsNonResident = 1;
// update the end of the file record // update the end of the file record
// calculate position of end markers (1 byte for empty data run) // calculate position of end markers (1 byte for empty data run)
EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1;
@ -750,7 +742,22 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb,
(PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset), (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset),
FILE_RECORD_END); FILE_RECORD_END);
// update file record on disk // Initialize the MCB, potentially catch an exception
_SEH2_TRY
{
FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
DPRINT1("Unable to create LargeMcb!\n");
ExFreePoolWithTag(AttribData, TAG_NTFS);
_SEH2_YIELD(return _SEH2_GetExceptionCode());
} _SEH2_END;
// Mark the attribute as non-resident (we wait until after we know the LargeMcb was initialized)
AttrContext->Record.IsNonResident = Destination->IsNonResident = 1;
// Update file record on disk
Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -760,13 +767,6 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb,
return Status; return Status;
} }
// Initialize the MCB, potentially catch an exception
_SEH2_TRY{
FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool);
} _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
_SEH2_YIELD(return _SEH2_GetExceptionCode());
} _SEH2_END;
// Now we can treat the attribute as non-resident and enlarge it normally // Now we can treat the attribute as non-resident and enlarge it normally
Status = SetNonResidentAttributeDataLength(Vcb, AttrContext, AttrOffset, FileRecord, DataSize); Status = SetNonResidentAttributeDataLength(Vcb, AttrContext, AttrOffset, FileRecord, DataSize);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -1729,7 +1729,7 @@ AddNewMftEntry(PFILE_RECORD_HEADER FileRecord,
RTL_BITMAP Bitmap; RTL_BITMAP Bitmap;
ULONGLONG BitmapDataSize; ULONGLONG BitmapDataSize;
ULONGLONG AttrBytesRead; ULONGLONG AttrBytesRead;
PVOID BitmapData; PUCHAR BitmapData;
ULONG LengthWritten; ULONG LengthWritten;
PNTFS_ATTR_CONTEXT BitmapContext; PNTFS_ATTR_CONTEXT BitmapContext;
LARGE_INTEGER BitmapBits; LARGE_INTEGER BitmapBits;
@ -1765,17 +1765,20 @@ AddNewMftEntry(PFILE_RECORD_HEADER FileRecord,
return STATUS_OBJECT_NAME_NOT_FOUND; return STATUS_OBJECT_NAME_NOT_FOUND;
} }
// we need to backup the bits for records 0x10 - 0x17 and leave them unassigned if they aren't assigned // We need to backup the bits for records 0x10 - 0x17 (3rd byte of bitmap) and mark these records
RtlCopyMemory(&SystemReservedBits, (PVOID)((ULONG_PTR)BitmapData + 2), 1); // as in-use so we don't assign files to those indices. They're reserved for the system (e.g. ChkDsk).
RtlFillMemory((PVOID)((ULONG_PTR)BitmapData + 2), 1, (UCHAR)0xFF); SystemReservedBits = BitmapData[2];
BitmapData[2] = 0xff;
// Calculate bit count // Calculate bit count
BitmapBits.QuadPart = AttributeDataLength(&(DeviceExt->MFTContext->Record)) / BitmapBits.QuadPart = AttributeDataLength(&(DeviceExt->MFTContext->Record)) /
DeviceExt->NtfsInfo.BytesPerFileRecord; DeviceExt->NtfsInfo.BytesPerFileRecord;
if (BitmapBits.HighPart != 0) if (BitmapBits.HighPart != 0)
{ {
DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported!\n"); DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported! (Your NTFS volume is too large)\n");
BitmapBits.LowPart = 0xFFFFFFFF; ExFreePoolWithTag(BitmapData, TAG_NTFS);
ReleaseAttributeContext(BitmapContext);
return STATUS_NOT_IMPLEMENTED;
} }
// convert buffer into bitmap // convert buffer into bitmap
@ -1809,7 +1812,7 @@ AddNewMftEntry(PFILE_RECORD_HEADER FileRecord,
// [BitmapData should have been updated via RtlFindClearBitsAndSet()] // [BitmapData should have been updated via RtlFindClearBitsAndSet()]
// Restore the system reserved bits // Restore the system reserved bits
RtlCopyMemory((PVOID)((ULONG_PTR)BitmapData + 2), &SystemReservedBits, 1); BitmapData[2] = SystemReservedBits;
// write the bitmap back to the MFT's $Bitmap attribute // write the bitmap back to the MFT's $Bitmap attribute
Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten); Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten);
@ -1845,9 +1848,9 @@ AddFixupArray(PDEVICE_EXTENSION Vcb,
PNTFS_RECORD_HEADER Record) PNTFS_RECORD_HEADER Record)
{ {
USHORT *pShortToFixUp; USHORT *pShortToFixUp;
unsigned int ArrayEntryCount = Record->UsaCount - 1; ULONG ArrayEntryCount = Record->UsaCount - 1;
unsigned int Offset = Vcb->NtfsInfo.BytesPerSector - 2; ULONG Offset = Vcb->NtfsInfo.BytesPerSector - 2;
int i; ULONG i;
PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->UsaOffset); PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->UsaOffset);