- Remove the right element from the list when uninitializing a file lock
- Do not modify the content of the table range while looping on its elements
- Fix rebuilding the table when unlocking a shared range
Thanks go to Pierre for the hint for where to look at
CORE-6615 #comment fixed by r57798 #resolve
CIRE-6535 #comment fixed by r55798 #resolve
svn path=/trunk/; revision=57798
- else
- {
- DPRINT("Overlapping shared lock %wZ %08x%08x %08x%08x\n",
- &FileObject->FileName,
- Conflict->Exclusive.FileLock.StartingByte.HighPart,
- Conflict->Exclusive.FileLock.StartingByte.LowPart,
- Conflict->Exclusive.FileLock.EndingByte.HighPart,
- Conflict->Exclusive.FileLock.EndingByte.LowPart);
- Conflict = FsRtlpRebuildSharedLockRange(FileLock,
- LockInfo,
- &ToInsert);
- if (!Conflict)
- {
- IoStatus->Status = STATUS_NO_MEMORY;
- if (Irp)
- {
- FsRtlCompleteLockIrpReal
- (FileLock->CompleteLockIrpRoutine,
- Context,
- Irp,
- IoStatus->Status,
- &Status,
- FileObject);
- }
- break;
- }
- }
+ }
+ }
+
+ DPRINT("Overlapping shared lock %wZ %08x%08x %08x%08x\n",
+ &FileObject->FileName,
+ Conflict->Exclusive.FileLock.StartingByte.HighPart,
+ Conflict->Exclusive.FileLock.StartingByte.LowPart,
+ Conflict->Exclusive.FileLock.EndingByte.HighPart,
+ Conflict->Exclusive.FileLock.EndingByte.LowPart);
+ Conflict = FsRtlpRebuildSharedLockRange(FileLock,
+ LockInfo,
+ &ToInsert);
+ if (!Conflict)
+ {
+ IoStatus->Status = STATUS_NO_MEMORY;
+ if (Irp)
+ {
+ FsRtlCompleteLockIrpReal
+ (FileLock->CompleteLockIrpRoutine,
+ Context,
+ Irp,
+ IoStatus->Status,
+ &Status,
+ FileObject);
return FALSE;
}
DPRINT("Adding shared lock %wZ\n", &FileObject->FileName);
return FALSE;
}
DPRINT("Adding shared lock %wZ\n", &FileObject->FileName);
- NewSharedRange->Start = ToInsert.Exclusive.FileLock.StartingByte;
- NewSharedRange->End = ToInsert.Exclusive.FileLock.EndingByte;
+ NewSharedRange->Start = *FileOffset;
+ NewSharedRange->End.QuadPart = FileOffset->QuadPart + Length->QuadPart;
NewSharedRange->Key = Key;
NewSharedRange->ProcessId = ToInsert.Exclusive.FileLock.ProcessId;
InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry);
NewSharedRange->Key = Key;
NewSharedRange->ProcessId = ToInsert.Exclusive.FileLock.ProcessId;
InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry);
return FALSE;
}
DPRINT("Adding shared lock %wZ\n", &FileObject->FileName);
return FALSE;
}
DPRINT("Adding shared lock %wZ\n", &FileObject->FileName);
- NewSharedRange->Start = ToInsert.Exclusive.FileLock.StartingByte;
- NewSharedRange->End = ToInsert.Exclusive.FileLock.EndingByte;
+ NewSharedRange->Start = *FileOffset;
+ NewSharedRange->End.QuadPart = FileOffset->QuadPart + Length->QuadPart;
NewSharedRange->Key = Key;
NewSharedRange->Key = Key;
- NewSharedRange->ProcessId = ToInsert.Exclusive.FileLock.ProcessId;
+ NewSharedRange->ProcessId = Process->UniqueProcessId;
InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry);
}
InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry);
}
- PLIST_ENTRY SharedRangeEntry;
- PLOCK_SHARED_RANGE WatchSharedRange;
- COMBINED_LOCK_ELEMENT RemadeElement;
- Find.Exclusive.FileLock.StartingByte = SharedRange->Start;
- Find.Exclusive.FileLock.EndingByte = SharedRange->End;
- SharedEntry = SharedRange->Entry.Flink;
+ /* Remove the found range from the shared range lists */
RemoveEntryList(&SharedRange->Entry);
ExFreePoolWithTag(SharedRange, 'FSRA');
/* We need to rebuild the list of shared ranges. */
RemoveEntryList(&SharedRange->Entry);
ExFreePoolWithTag(SharedRange, 'FSRA');
/* We need to rebuild the list of shared ranges. */
Entry->Exclusive.FileLock.StartingByte.LowPart,
Entry->Exclusive.FileLock.EndingByte.HighPart,
Entry->Exclusive.FileLock.EndingByte.LowPart);
Entry->Exclusive.FileLock.StartingByte.LowPart,
Entry->Exclusive.FileLock.EndingByte.HighPart,
Entry->Exclusive.FileLock.EndingByte.LowPart);
- /* Copy */
- RemadeElement = *Entry;
- RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry);
+
+ /* Remember what was in there and remove it from the table */
+ Find = *Entry;
+ RtlDeleteElementGenericTable(&InternalInfo->RangeTable, &Find);
/* Put shared locks back in place */
/* Put shared locks back in place */
- for (SharedRangeEntry = InternalInfo->SharedLocks.Flink;
- SharedRangeEntry != &InternalInfo->SharedLocks;
- SharedRangeEntry = SharedRangeEntry->Flink)
+ for (SharedEntry = InternalInfo->SharedLocks.Flink;
+ SharedEntry != &InternalInfo->SharedLocks;
+ SharedEntry = SharedEntry->Flink)
{
COMBINED_LOCK_ELEMENT LockElement;
{
COMBINED_LOCK_ELEMENT LockElement;
- WatchSharedRange = CONTAINING_RECORD(SharedRangeEntry, LOCK_SHARED_RANGE, Entry);
- LockElement.Exclusive.FileLock.StartingByte = WatchSharedRange->Start;
- LockElement.Exclusive.FileLock.EndingByte = WatchSharedRange->End;
- if (LockCompare(&InternalInfo->RangeTable, &RemadeElement, &LockElement) != GenericEqual)
+ SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry);
+ LockElement.Exclusive.FileLock.FileObject = FileObject;
+ LockElement.Exclusive.FileLock.StartingByte = SharedRange->Start;
+ LockElement.Exclusive.FileLock.EndingByte = SharedRange->End;
+ LockElement.Exclusive.FileLock.ProcessId = SharedRange->ProcessId;
+ LockElement.Exclusive.FileLock.Key = SharedRange->Key;
+ LockElement.Exclusive.FileLock.ExclusiveLock = FALSE;
+
+ if (LockCompare(&InternalInfo->RangeTable, &Find, &LockElement) != GenericEqual)
{
DPRINT("Skipping range %08x%08x:%08x%08x\n",
LockElement.Exclusive.FileLock.StartingByte.HighPart,
{
DPRINT("Skipping range %08x%08x:%08x%08x\n",
LockElement.Exclusive.FileLock.StartingByte.HighPart,
LockElement.Exclusive.FileLock.StartingByte.LowPart,
LockElement.Exclusive.FileLock.EndingByte.HighPart,
LockElement.Exclusive.FileLock.EndingByte.LowPart);
LockElement.Exclusive.FileLock.StartingByte.LowPart,
LockElement.Exclusive.FileLock.EndingByte.HighPart,
LockElement.Exclusive.FileLock.EndingByte.LowPart);
- RtlZeroMemory(&RemadeElement, sizeof(RemadeElement));
- RemadeElement.Exclusive.FileLock.StartingByte = WatchSharedRange->Start;
- RemadeElement.Exclusive.FileLock.EndingByte = WatchSharedRange->End;
- FsRtlpRebuildSharedLockRange(FileLock, InternalInfo, &RemadeElement);
+ FsRtlpRebuildSharedLockRange(FileLock, InternalInfo, &LockElement);
return STATUS_RANGE_NOT_LOCKED;
}
}
return STATUS_RANGE_NOT_LOCKED;
}
}
DPRINT("Lock still has:\n");
for (SharedEntry = InternalInfo->SharedLocks.Flink;
SharedEntry != &InternalInfo->SharedLocks;
DPRINT("Lock still has:\n");
for (SharedEntry = InternalInfo->SharedLocks.Flink;
SharedEntry != &InternalInfo->SharedLocks;
SharedRange->End.LowPart,
SharedRange->Key);
}
SharedRange->End.LowPart,
SharedRange->Key);
}
// this is definitely the thing we want
InternalInfo->Generation++;
// this is definitely the thing we want
InternalInfo->Generation++;
{
SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry);
SharedEntry = SharedEntry->Flink;
{
SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry);
SharedEntry = SharedEntry->Flink;
- RemoveEntryList(SharedEntry);
+ RemoveEntryList(&SharedRange->Entry);
ExFreePoolWithTag(SharedRange, 'FSRA');
}
while ((Entry = RtlGetElementGenericTable(&InternalInfo->RangeTable, 0)) != NULL)
ExFreePoolWithTag(SharedRange, 'FSRA');
}
while ((Entry = RtlGetElementGenericTable(&InternalInfo->RangeTable, 0)) != NULL)