Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 09:13:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:FSRTL] Check return status of FsRtl locking functions

Browse source 
CORE-17637
This commit is contained in:
Jérôme Gardou 2021-06-18 10:01:59 +02:00 • committed by Jérôme Gardou
parent e55eeb2d9c
commit 46af941c4c
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ntoskrnl/fsrtl/filelock.c
View file

@ -994,6 +994,7 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock,
InternalInfo->Generation++; InternalInfo->Generation++;
while ((NextMatchingLockIrp = IoCsqRemoveNextIrp(&InternalInfo->Csq, &Find))) while ((NextMatchingLockIrp = IoCsqRemoveNextIrp(&InternalInfo->Csq, &Find)))
{ {
NTSTATUS Status;
if (NextMatchingLockIrp->IoStatus.Information == InternalInfo->Generation) if (NextMatchingLockIrp->IoStatus.Information == InternalInfo->Generation)
{ {
// We've already looked at this one, meaning that we looped. // We've already looked at this one, meaning that we looped.
@ -1011,7 +1012,9 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock,
// because somebody else snatched part of the range in a new thread. // because somebody else snatched part of the range in a new thread.
DPRINT("Locking another IRP %p for %p %wZ\n", DPRINT("Locking another IRP %p for %p %wZ\n",
NextMatchingLockIrp, FileLock, &FileObject->FileName); NextMatchingLockIrp, FileLock, &FileObject->FileName);
FsRtlProcessFileLock(InternalInfo->BelongsTo, NextMatchingLockIrp, NULL); Status = FsRtlProcessFileLock(InternalInfo->BelongsTo, NextMatchingLockIrp, NULL);
if (!NT_SUCCESS(Status))
return Status;
} }
DPRINT("Success %wZ\n", &FileObject->FileName); DPRINT("Success %wZ\n", &FileObject->FileName);
@ -1173,23 +1176,25 @@ FsRtlProcessFileLock(IN PFILE_LOCK FileLock,
{ {
/* A lock */ /* A lock */
case IRP_MN_LOCK: case IRP_MN_LOCK:
{
/* Call the private lock routine */ /* Call the private lock routine */
FsRtlPrivateLock(FileLock, BOOLEAN Result = FsRtlPrivateLock(FileLock,
IoStackLocation->FileObject, IoStackLocation->FileObject,
&IoStackLocation-> &IoStackLocation->Parameters.LockControl.ByteOffset,
Parameters.LockControl.ByteOffset, IoStackLocation->Parameters.LockControl.Length,
IoStackLocation->Parameters.LockControl.Length, IoGetRequestorProcess(Irp),
IoGetRequestorProcess(Irp), IoStackLocation->Parameters.LockControl.Key,
IoStackLocation->Parameters.LockControl.Key, IoStackLocation->Flags & SL_FAIL_IMMEDIATELY,
IoStackLocation->Flags & SL_FAIL_IMMEDIATELY, IoStackLocation->Flags & SL_EXCLUSIVE_LOCK,
IoStackLocation->Flags & SL_EXCLUSIVE_LOCK, &IoStatusBlock,
&IoStatusBlock, Irp,
Irp, Context,
Context, FALSE);
FALSE); /* FsRtlPrivateLock has _Must_inspect_result_. Just check this is consistent on debug builds */
NT_ASSERT(Result == NT_SUCCESS(IoStatusBlock.Status));
(void)Result;
return IoStatusBlock.Status; return IoStatusBlock.Status;
}
/* A single unlock */ /* A single unlock */
case IRP_MN_UNLOCK_SINGLE: case IRP_MN_UNLOCK_SINGLE:
@ -1299,7 +1304,10 @@ FsRtlUninitializeFileLock(IN PFILE_LOCK FileLock)
} }
while ((Irp = IoCsqRemoveNextIrp(&InternalInfo->Csq, NULL)) != NULL) while ((Irp = IoCsqRemoveNextIrp(&InternalInfo->Csq, NULL)) != NULL)
{ {
FsRtlProcessFileLock(FileLock, Irp, NULL); NTSTATUS Status = FsRtlProcessFileLock(FileLock, Irp, NULL);
/* FsRtlProcessFileLock has _Must_inspect_result_ */
NT_ASSERT(NT_SUCCESS(Status));
(void)Status;
} }
ExFreePoolWithTag(InternalInfo, TAG_FLOCK); ExFreePoolWithTag(InternalInfo, TAG_FLOCK);
FileLock->LockInformation = NULL; FileLock->LockInformation = NULL;