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: avoid allocating memory for some IOCTL_STORAGE_QUERY_PROPERTY calls that always return fixed size structures.

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-07-29 15:49:30 +02:00
parent 8288fecc0a
commit 7158e2b097
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Driver/Ntvol.c
View File

@@ -89,7 +89,6 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
LARGE_INTEGER diskLengthInfo; LARGE_INTEGER diskLengthInfo;
DISK_GEOMETRY_EX dg; DISK_GEOMETRY_EX dg;
STORAGE_PROPERTY_QUERY storagePropertyQuery = {0}; STORAGE_PROPERTY_QUERY storagePropertyQuery = {0};
STORAGE_DESCRIPTOR_HEADER storageHeader = {0};
byte* dgBuffer; byte* dgBuffer;
ntStatus = IoGetDeviceObjectPointer (&FullFileName, ntStatus = IoGetDeviceObjectPointer (&FullFileName,
@@ -127,6 +126,7 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
NTSTATUS lStatus; NTSTATUS lStatus;
storage.Version = sizeof (STORAGE_READ_CAPACITY); storage.Version = sizeof (STORAGE_READ_CAPACITY);
storage.Size = sizeof (STORAGE_READ_CAPACITY);
lStatus = TCSendHostDeviceIoControlRequest (DeviceObject, Extension, lStatus = TCSendHostDeviceIoControlRequest (DeviceObject, Extension,
IOCTL_STORAGE_READ_CAPACITY, IOCTL_STORAGE_READ_CAPACITY,
(char*) &storage, sizeof (STORAGE_READ_CAPACITY)); (char*) &storage, sizeof (STORAGE_READ_CAPACITY));
@@ -150,54 +150,33 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
/* IOCTL_STORAGE_QUERY_PROPERTY supported only on Vista and above */ /* IOCTL_STORAGE_QUERY_PROPERTY supported only on Vista and above */
if (OsMajorVersion >= 6) if (OsMajorVersion >= 6)
{ {
STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR alignmentDesc = {0};
STORAGE_ADAPTER_DESCRIPTOR adapterDesc = {0};
storagePropertyQuery.PropertyId = StorageAccessAlignmentProperty; storagePropertyQuery.PropertyId = StorageAccessAlignmentProperty;
storagePropertyQuery.QueryType = PropertyStandardQuery; storagePropertyQuery.QueryType = PropertyStandardQuery;
alignmentDesc.Version = sizeof (STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
alignmentDesc.Size = sizeof (STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY, if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY,
(char*) &storagePropertyQuery, sizeof(storagePropertyQuery), (char*) &storagePropertyQuery, sizeof(storagePropertyQuery),
(char *) &storageHeader, sizeof (storageHeader)))) (char *) &alignmentDesc, sizeof (alignmentDesc))))
{ {
byte* outputBuffer = TCalloc (storageHeader.Size); Extension->HostBytesPerPhysicalSector = alignmentDesc.BytesPerPhysicalSector;
if (!outputBuffer)
{
ntStatus = STATUS_INSUFFICIENT_RESOURCES;
goto error;
}
if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY,
(char*) &storagePropertyQuery, sizeof(storagePropertyQuery),
outputBuffer, storageHeader.Size)))
{
PSTORAGE_ACCESS_ALIGNMENT_DESCRIPTOR pStorageDescriptor = (PSTORAGE_ACCESS_ALIGNMENT_DESCRIPTOR) outputBuffer;
Extension->HostBytesPerPhysicalSector = pStorageDescriptor->BytesPerPhysicalSector;
}
TCfree (outputBuffer);
} }
storagePropertyQuery.PropertyId = StorageAdapterProperty; storagePropertyQuery.PropertyId = StorageAdapterProperty;
adapterDesc.Version = sizeof (STORAGE_ADAPTER_DESCRIPTOR);
adapterDesc.Size = sizeof (STORAGE_ADAPTER_DESCRIPTOR);
if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY, if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY,
(char*) &storagePropertyQuery, sizeof(storagePropertyQuery), (char*) &storagePropertyQuery, sizeof(storagePropertyQuery),
(char *) &storageHeader, sizeof (storageHeader)))) (char *) &adapterDesc, sizeof (adapterDesc))))
{ {
byte* outputBuffer = TCalloc (storageHeader.Size); Extension->HostMaximumTransferLength = adapterDesc.MaximumTransferLength;
if (!outputBuffer) Extension->HostMaximumPhysicalPages = adapterDesc.MaximumPhysicalPages;
{ Extension->HostAlignmentMask = adapterDesc.AlignmentMask;
ntStatus = STATUS_INSUFFICIENT_RESOURCES;
goto error;
}
if (NT_SUCCESS (TCSendHostDeviceIoControlRequestEx (DeviceObject, Extension, IOCTL_STORAGE_QUERY_PROPERTY,
(char*) &storagePropertyQuery, sizeof(storagePropertyQuery),
outputBuffer, storageHeader.Size)))
{
PSTORAGE_ADAPTER_DESCRIPTOR pStorageDescriptor = (PSTORAGE_ADAPTER_DESCRIPTOR) outputBuffer;
Extension->HostMaximumTransferLength = pStorageDescriptor->MaximumTransferLength;
Extension->HostMaximumPhysicalPages = pStorageDescriptor->MaximumPhysicalPages;
Extension->HostAlignmentMask = pStorageDescriptor->AlignmentMask;
}
TCfree (outputBuffer);
} }
} }