Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 22:18:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTFS]

Browse source 
Add some fixes to attrib.c, as suggested by Pierre Schweitzer:
*ConvertLargeMCBToDataRuns() - Use MS portable type, ULONG, for variable i.
*FreeClusters(), AddRun() - Check for invalid parameter before allocating memory, and confirm the memory is allocated.
*ConvertDataRunsToLargeMCB(), AddRun() - Avoid code duplication by using ExRaiseStatus() in try block, and return accurate status via _SEH2_GetExceptionCode().

svn path=/branches/GSoC_2016/NTFS/; revision=72422
This commit is contained in:
Trevor Thompson 2016-08-22 08:11:12 +00:00 committed by Thomas Faber
parent 920e2f0216
commit 8b893c8e30
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/filesystems/ntfs/attrib.c
View file

@ -62,7 +62,9 @@
* *
* @return * @return
* STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute. * STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute.
* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails. * STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails or if we fail to allocate a
* buffer for the new data runs.
* STATUS_INSUFFICIENT_RESOURCES or STATUS_UNSUCCESSFUL if FsRtlAddLargeMcbEntry() fails.
* STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. * STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails.
* STATUS_NOT_IMPLEMENTED if we need to migrate the attribute to an attribute list (TODO). * STATUS_NOT_IMPLEMENTED if we need to migrate the attribute to an attribute list (TODO).
* *
@ -95,6 +97,11 @@ AddRun(PNTFS_VCB Vcb,
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS);
if (!RunBuffer)
{
DPRINT1("ERROR: Couldn't allocate memory for data runs!\n");
return STATUS_INSUFFICIENT_RESOURCES;
}
// Convert the data runs to a map control block // Convert the data runs to a map control block
Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN); Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN);
@ -112,14 +119,12 @@ AddRun(PNTFS_VCB Vcb,
NextAssignedCluster, NextAssignedCluster,
RunLength)) RunLength))
{ {
FsRtlUninitializeLargeMcb(&DataRunsMCB); ExRaiseStatus(STATUS_UNSUCCESSFUL);
ExFreePoolWithTag(RunBuffer, TAG_NTFS);
return STATUS_INSUFFICIENT_RESOURCES;
} }
} _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
FsRtlUninitializeLargeMcb(&DataRunsMCB); FsRtlUninitializeLargeMcb(&DataRunsMCB);
ExFreePoolWithTag(RunBuffer, TAG_NTFS); ExFreePoolWithTag(RunBuffer, TAG_NTFS);
_SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); _SEH2_YIELD(_SEH2_GetExceptionCode());
} _SEH2_END; } _SEH2_END;
@ -200,7 +205,7 @@ AddRun(PNTFS_VCB Vcb,
* Pointer to an unitialized LARGE_MCB structure. * Pointer to an unitialized LARGE_MCB structure.
* *
* @return * @return
* STATUS_SUCCESS on success, STATUS_INSUFFICIENT_RESOURCES if we fail to * STATUS_SUCCESS on success, STATUS_INSUFFICIENT_RESOURCES or STATUS_UNSUCCESSFUL if we fail to
* initialize the mcb or add an entry. * initialize the mcb or add an entry.
* *
* @remarks * @remarks
@ -223,7 +228,7 @@ ConvertDataRunsToLargeMCB(PUCHAR DataRun,
_SEH2_TRY{ _SEH2_TRY{
FsRtlInitializeLargeMcb(DataRunsMCB, NonPagedPool); FsRtlInitializeLargeMcb(DataRunsMCB, NonPagedPool);
} _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
_SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); _SEH2_YIELD(return _SEH2_GetExceptionCode());
} _SEH2_END; } _SEH2_END;
while (*DataRun != 0) while (*DataRun != 0)
@ -242,12 +247,11 @@ ConvertDataRunsToLargeMCB(PUCHAR DataRun,
DataRunStartLCN, DataRunStartLCN,
DataRunLength)) DataRunLength))
{ {
FsRtlUninitializeLargeMcb(DataRunsMCB); ExRaiseStatus(STATUS_UNSUCCESSFUL);
return STATUS_INSUFFICIENT_RESOURCES;
} }
} _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
FsRtlUninitializeLargeMcb(DataRunsMCB); FsRtlUninitializeLargeMcb(DataRunsMCB);
_SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); _SEH2_YIELD(return _SEH2_GetExceptionCode());
} _SEH2_END; } _SEH2_END;
} }
@ -292,7 +296,7 @@ ConvertLargeMCBToDataRuns(PLARGE_MCB DataRunsMCB,
LONGLONG DataRunOffset; LONGLONG DataRunOffset;
ULONGLONG LastLCN = 0; ULONGLONG LastLCN = 0;
LONGLONG Vbn, Lbn, Count; LONGLONG Vbn, Lbn, Count;
int i; ULONG i;
DPRINT("\t[Vbn, Lbn, Count]\n"); DPRINT("\t[Vbn, Lbn, Count]\n");
@ -436,7 +440,8 @@ FindRun(PNTFS_ATTR_RECORD NresAttr,
* @return * @return
* STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute, * STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute,
* or if the caller requested more clusters be freed than the attribute has been allocated. * or if the caller requested more clusters be freed than the attribute has been allocated.
* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails. * STATUS_INSUFFICIENT_RESOURCES if allocating a buffer for the data runs fails or
* if ConvertDataRunsToLargeMCB() fails.
* STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. * STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails.
* *
* *
@ -460,7 +465,7 @@ FreeClusters(PNTFS_VCB Vcb,
ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN; ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN;
// Allocate some memory for the RunBuffer // Allocate some memory for the RunBuffer
PUCHAR RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); PUCHAR RunBuffer;
ULONG RunBufferOffset = 0; ULONG RunBufferOffset = 0;
PFILE_RECORD_HEADER BitmapRecord; PFILE_RECORD_HEADER BitmapRecord;
@ -472,10 +477,16 @@ FreeClusters(PNTFS_VCB Vcb,
if (!AttrContext->Record.IsNonResident) if (!AttrContext->Record.IsNonResident)
{ {
ExFreePoolWithTag(RunBuffer, TAG_NTFS);
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS);
if (!RunBuffer)
{
DPRINT1("ERROR: Couldn't allocate memory for data runs!\n");
return STATUS_INSUFFICIENT_RESOURCES;
}
// Convert the data runs to a map control block // Convert the data runs to a map control block
Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN); Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))