Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 15:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DISK]

Browse source 
Add a hack to forcibly set sector size in case of weird input. This is noisy on purpose.
Also, be more informative in case of read rejection. Are we reading beyond partition or do we have invalid sector size?
With the hack, the invalid sector size should disappear.

This is to help debugging the recent errors with the removal of IopParseDevice() hack

svn path=/trunk/; revision=65205
This commit is contained in:
Pierre Schweitzer 2014-11-02 23:11:22 +00:00
parent 3fc8b084e5
commit 21cd59bc0f
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/drivers/storage/class/disk/disk.c
View file

@ -1514,6 +1514,15 @@ Return Value:
ULONG transferByteCount = currentIrpStack->Parameters.Read.Length;
LARGE_INTEGER startingOffset;
//
// HACK: How can we end here with null sector size?!
//
if (deviceExtension->DiskGeometry->Geometry.BytesPerSector == 0) {
DPRINT1("Hack! Received invalid sector size\n");
deviceExtension->DiskGeometry->Geometry.BytesPerSector = 512;
}
//
// Verify parameters of this request.
// Check that ending sector is within partition and
@ -1550,7 +1559,18 @@ Return Value:
Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
}
DPRINT1("STATUS_INVALID_PARAMETER\n");
if (startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) {
DPRINT1("Reading beyond partition end! startingOffset: %I64d, PartitionLength: %I64d\n", startingOffset.QuadPart, deviceExtension->PartitionLength.QuadPart);
}
if (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1)) {
DPRINT1("Not reading sectors! TransferByteCount: %lu, BytesPerSector: %lu\n", transferByteCount, deviceExtension->DiskGeometry->Geometry.BytesPerSector);
}
if (Irp->IoStatus.Status == STATUS_DEVICE_NOT_READY) {
DPRINT1("Failing due to device not ready!\n");
}
return STATUS_INVALID_PARAMETER;
}