From f9c3bcd384622abe38a141b1035fede90b2d595a Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 9 Aug 2015 00:16:07 +0200 Subject: Windows: Solve crash of TOR when run from VeraCrypt volume by explicitly returning error code when unsupported IOCTL_STORAGE_QUERY_PROPERTY parameter encountered. --- src/Driver/Ntdriver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Driver/Ntdriver.c b/src/Driver/Ntdriver.c index 0a71d08b..519fdc09 100644 --- a/src/Driver/Ntdriver.c +++ b/src/Driver/Ntdriver.c @@ -636,6 +636,10 @@ NTSTATUS ProcessVolumeDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION PSTORAGE_PROPERTY_QUERY pStoragePropQuery = (PSTORAGE_PROPERTY_QUERY) Irp->AssociatedIrp.SystemBuffer; STORAGE_QUERY_TYPE type = pStoragePropQuery->QueryType; + /* return error if an unsupported type is encountered */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + if (type == PropertyExistsQuery) { if (pStoragePropQuery->PropertyId == StorageAccessAlignmentProperty) -- cgit v1.2.3