Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Windows Driver: Use real disk sector size instead of generic 512 bytes value when probing disk real size

Browse Source
This commit is contained in:
Mounir IDRASSI
2020-06-21 17:39:40 +02:00
parent a4c5f03bee
commit bec929ce03
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Driver/Ntdriver.c
View File

@@ -3653,11 +3653,16 @@ NTSTATUS ProbeRealDriveSize (PDEVICE_OBJECT driveDeviceObject, LARGE_INTEGER *dr
LARGE_INTEGER offset; LARGE_INTEGER offset;
byte *sectorBuffer; byte *sectorBuffer;
ULONGLONG startTime; ULONGLONG startTime;
ULONG sectorSize;
if (!UserCanAccessDriveDevice()) if (!UserCanAccessDriveDevice())
return STATUS_ACCESS_DENIED; return STATUS_ACCESS_DENIED;
sectorBuffer = TCalloc (TC_SECTOR_SIZE_BIOS); status = GetDeviceSectorSize (driveDeviceObject, &sectorSize);
if (!NT_SUCCESS (status))
return status;
sectorBuffer = TCalloc (sectorSize);
if (!sectorBuffer) if (!sectorBuffer)
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
@@ -3672,12 +3677,12 @@ NTSTATUS ProbeRealDriveSize (PDEVICE_OBJECT driveDeviceObject, LARGE_INTEGER *dr
} }
startTime = KeQueryInterruptTime (); startTime = KeQueryInterruptTime ();
for (offset.QuadPart = sysLength.QuadPart; ; offset.QuadPart += TC_SECTOR_SIZE_BIOS) for (offset.QuadPart = sysLength.QuadPart; ; offset.QuadPart += sectorSize)
{ {
status = TCReadDevice (driveDeviceObject, sectorBuffer, offset, TC_SECTOR_SIZE_BIOS); status = TCReadDevice (driveDeviceObject, sectorBuffer, offset, sectorSize);
if (NT_SUCCESS (status)) if (NT_SUCCESS (status))
status = TCWriteDevice (driveDeviceObject, sectorBuffer, offset, TC_SECTOR_SIZE_BIOS); status = TCWriteDevice (driveDeviceObject, sectorBuffer, offset, sectorSize);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {