From 7d52dda67c370de7d615678b61920c822eeb7142 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 3 May 2015 08:43:10 +0200
Subject: Windows Driver: Implement querying physical sector size of veraCrypt
 volume through IOCTL_STORAGE_QUERY_PROPERTY

---
 src/Driver/Ntvol.c | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'src/Driver/Ntvol.c')

diff --git a/src/Driver/Ntvol.c b/src/Driver/Ntvol.c
index 7556b4cf..9acebaed 100644
--- a/src/Driver/Ntvol.c
+++ b/src/Driver/Ntvol.c
@@ -80,7 +80,9 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
 		PARTITION_INFORMATION pi;
 		PARTITION_INFORMATION_EX pix;
 		LARGE_INTEGER diskLengthInfo;
-		DISK_GEOMETRY dg;
+		DISK_GEOMETRY dg;    
+		STORAGE_PROPERTY_QUERY storagePropertyQuery = {0};
+		STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR storageDescriptor = {0};
 
 		ntStatus = IoGetDeviceObjectPointer (&FullFileName,
 			FILE_READ_DATA | FILE_READ_ATTRIBUTES,
@@ -97,6 +99,21 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
 		lDiskLength.QuadPart = dg.Cylinders.QuadPart * dg.SectorsPerTrack * dg.TracksPerCylinder * dg.BytesPerSector;
 		Extension->HostBytesPerSector = dg.BytesPerSector;
 
+		storagePropertyQuery.PropertyId = StorageAccessAlignmentProperty;
+		storagePropertyQuery.QueryType = PropertyStandardQuery;
+
+		/* IOCTL_STORAGE_QUERY_PROPERTY supported only on Vista and above */
+		if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY, 
+			(char*) &storagePropertyQuery, sizeof(storagePropertyQuery), 
+			(char *) &storageDescriptor, sizeof (storageDescriptor))))
+		{
+			Extension->HostBytesPerPhysicalSector = storageDescriptor.BytesPerPhysicalSector;
+		}
+		else
+		{
+			Extension->HostBytesPerPhysicalSector = dg.BytesPerSector;
+		}
+
 		// Drive geometry is used only when IOCTL_DISK_GET_PARTITION_INFO fails
 		if (NT_SUCCESS (TCSendHostDeviceIoControlRequest (DeviceObject, Extension, IOCTL_DISK_GET_PARTITION_INFO_EX, (char *) &pix, sizeof (pix))))
 		{
@@ -144,6 +161,7 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
 		}
 
 		Extension->HostBytesPerSector = mount->BytesPerSector;
+		Extension->HostBytesPerPhysicalSector = mount->BytesPerPhysicalSector;
 
 		if (Extension->HostBytesPerSector != TC_SECTOR_SIZE_FILE_HOSTED_VOLUME)
 			disableBuffering = FALSE;
@@ -746,9 +764,11 @@ void TCCloseVolume (PDEVICE_OBJECT DeviceObject, PEXTENSION Extension)
 }
 
 
-NTSTATUS TCSendHostDeviceIoControlRequest (PDEVICE_OBJECT DeviceObject,
+NTSTATUS TCSendHostDeviceIoControlRequestEx (PDEVICE_OBJECT DeviceObject,
 			       PEXTENSION Extension,
 			       ULONG IoControlCode,
+					 void *InputBuffer,
+					 ULONG InputBufferSize,
 			       void *OutputBuffer,
 			       ULONG OutputBufferSize)
 {
@@ -762,7 +782,7 @@ NTSTATUS TCSendHostDeviceIoControlRequest (PDEVICE_OBJECT DeviceObject,
 
 	Irp = IoBuildDeviceIoControlRequest (IoControlCode,
 					     Extension->pFsdDevice,
-					     NULL, 0,
+					     InputBuffer, InputBufferSize,
 					     OutputBuffer, OutputBufferSize,
 					     FALSE,
 					     &Extension->keVolumeEvent,
@@ -787,6 +807,15 @@ NTSTATUS TCSendHostDeviceIoControlRequest (PDEVICE_OBJECT DeviceObject,
 	return ntStatus;
 }
 
+NTSTATUS TCSendHostDeviceIoControlRequest (PDEVICE_OBJECT DeviceObject,
+			       PEXTENSION Extension,
+			       ULONG IoControlCode,
+			       void *OutputBuffer,
+			       ULONG OutputBufferSize)
+{
+	return TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IoControlCode, NULL, 0, OutputBuffer, OutputBufferSize);
+}
+
 NTSTATUS COMPLETE_IRP (PDEVICE_OBJECT DeviceObject,
 	      PIRP Irp,
 	      NTSTATUS IrpStatus,
-- 
cgit v1.2.3