[USBSTOR] Move PDO's Inquiry data and FDO's SCSI context

to their Device Extensions.
This way the driver can better handle low memory situations

Author: Extravert-ir

drivers/usb/usbstor/disk.c

@@ -283,8 +283,7 @@ USBSTOR_HandleQueryProperty(
         ASSERT(FDODeviceExtension);
         ASSERT(FDODeviceExtension->Common.IsFDO);
 
-        InquiryData = PDODeviceExtension->InquiryData;
-        ASSERT(InquiryData);
+        InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData;
 
         // compute extra parameters length
         FieldLengthVendor = USBSTOR_GetFieldLength(InquiryData->VendorId, 8);
@@ -507,7 +506,7 @@ USBSTOR_HandleDeviceControl(
 
             // Note: INQUIRYDATA structure is larger than INQUIRYDATABUFFERSIZE
             RtlZeroMemory(InquiryData, sizeof(INQUIRYDATA));
-            RtlCopyMemory(InquiryData, PDODeviceExtension->InquiryData, INQUIRYDATABUFFERSIZE);
+            RtlCopyMemory(InquiryData, &PDODeviceExtension->InquiryData, sizeof(PDODeviceExtension->InquiryData));
 
             InquiryData->Versions = 0x04;
             InquiryData->ResponseDataFormat = 0x02; // some devices set this to 1

drivers/usb/usbstor/error.c

@@ -77,15 +77,15 @@ USBSTOR_ResetPipeWorkItemRoutine(
     IN PVOID Ctx)
 {
     NTSTATUS Status;
-    PIRP_CONTEXT Context = (PIRP_CONTEXT)Ctx;
-    PFDO_DEVICE_EXTENSION FDODeviceExtension = (PFDO_DEVICE_EXTENSION)FdoDevice->DeviceExtension;
+    PFDO_DEVICE_EXTENSION FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Ctx;
+    PIRP_CONTEXT Context = &FDODeviceExtension->CurrentIrpContext;
 
     // clear stall on the corresponding pipe
     Status = USBSTOR_ResetPipeWithHandle(FDODeviceExtension->LowerDeviceObject, Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle);
     DPRINT1("USBSTOR_ResetPipeWithHandle Status %x\n", Status);
 
     // now resend the csw as the stall got cleared
-    USBSTOR_SendCSWRequest(Context, Context->Irp);
+    USBSTOR_SendCSWRequest(FDODeviceExtension, Context->Irp);
 }
 
 VOID
@@ -133,15 +133,14 @@ USBSTOR_ResetDeviceWorkItemRoutine(
 VOID
 NTAPI
 USBSTOR_QueueResetPipe(
-    IN PFDO_DEVICE_EXTENSION FDODeviceExtension,
-    IN PIRP_CONTEXT Context)
+    IN PFDO_DEVICE_EXTENSION FDODeviceExtension)
 {
     DPRINT("USBSTOR_QueueResetPipe\n");
 
     IoQueueWorkItem(FDODeviceExtension->ResetDeviceWorkItem,
                     USBSTOR_ResetPipeWorkItemRoutine,
                     CriticalWorkQueue,
-                    Context);
+                    FDODeviceExtension);
 }
 
 VOID

drivers/usb/usbstor/pdo.c

@@ -137,8 +137,7 @@ USBSTOR_PdoHandleQueryDeviceText(
     IoStack = IoGetCurrentIrpStackLocation(Irp);
 
     DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-    ASSERT(DeviceExtension->InquiryData);
-    InquiryData = DeviceExtension->InquiryData;
+    InquiryData = (PINQUIRYDATA)&DeviceExtension->InquiryData;
 
     switch (IoStack->Parameters.QueryDeviceText.DeviceTextType)
     {
@@ -191,8 +190,7 @@ USBSTOR_PdoHandleQueryDeviceId(
     UNICODE_STRING DeviceId;
 
     DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-    ASSERT(DeviceExtension->InquiryData);
-    InquiryData = DeviceExtension->InquiryData;
+    InquiryData = (PINQUIRYDATA)&DeviceExtension->InquiryData;
 
     DeviceType = USBSTOR_GetDeviceType(InquiryData);
 
@@ -282,7 +280,7 @@ USBSTOR_PdoHandleQueryHardwareId(
     PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
     FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension;
     ASSERT(FDODeviceExtension->DeviceDescriptor);
-    InquiryData = PDODeviceExtension->InquiryData;
+    InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData;
 
     DeviceType = USBSTOR_GetDeviceType(InquiryData);
     GenericType = USBSTOR_GetGenericType(InquiryData);
@@ -404,7 +402,7 @@ USBSTOR_PdoHandleQueryCompatibleId(
     PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
     FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension;
     ASSERT(FDODeviceExtension->DeviceDescriptor);
-    DeviceType = USBSTOR_GetDeviceType(PDODeviceExtension->InquiryData);
+    DeviceType = USBSTOR_GetDeviceType((PINQUIRYDATA)&PDODeviceExtension->InquiryData);
 
     // format instance id
     Length = sprintf(Buffer, "USBSTOR\\%s", DeviceType) + 1;
@@ -573,10 +571,6 @@ USBSTOR_PdoHandlePnp(
                bDelete = FALSE;
            }
 
-           // clean up the device extension
-           ASSERT(DeviceExtension->InquiryData);
-           ExFreePoolWithTag(DeviceExtension->InquiryData, USB_STOR_TAG);
-
            Irp->IoStatus.Status = STATUS_SUCCESS;
            IoCompleteRequest(Irp, IO_NO_INCREMENT);
 
@@ -804,19 +798,10 @@ USBSTOR_FillInquiryData(
     IN PDEVICE_OBJECT PDODeviceObject)
 {
     NTSTATUS Status = STATUS_INSUFFICIENT_RESOURCES;
-    PPDO_DEVICE_EXTENSION PDODeviceExtension;
+    PPDO_DEVICE_EXTENSION PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension;
     CDB Cdb;
     ULONG DataTransferLength = INQUIRYDATABUFFERSIZE;
-    PINQUIRYDATA InquiryData;
-
-    PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension;
-    InquiryData = ExAllocatePoolWithTag(NonPagedPool, INQUIRYDATABUFFERSIZE, USB_STOR_TAG);
-
-    if (!InquiryData)
-    {
-        DPRINT1("USBSTOR_FillInquiryData failed with %x\n", Status);
-        return Status;
-    }
+    PINQUIRYDATA InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData;
 
     RtlZeroMemory(&Cdb, sizeof(Cdb));
     Cdb.CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY;
@@ -827,7 +812,6 @@ USBSTOR_FillInquiryData(
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("USBSTOR_FillInquiryData failed with %x\n", Status);
-        ExFreePoolWithTag(InquiryData, USB_STOR_TAG);
         return Status;
     }
 
@@ -846,7 +830,6 @@ USBSTOR_FillInquiryData(
 
     DPRINT("Revision %c%c%c%c\n", InquiryData->ProductRevisionLevel[0], InquiryData->ProductRevisionLevel[1], InquiryData->ProductRevisionLevel[2], InquiryData->ProductRevisionLevel[3]);
 
-    PDODeviceExtension->InquiryData = InquiryData;
     return Status;
 }
 
@@ -859,6 +842,7 @@ USBSTOR_CreatePDO(
     NTSTATUS Status;
     PPDO_DEVICE_EXTENSION PDODeviceExtension;
     PFDO_DEVICE_EXTENSION FDODeviceExtension;
+    PINQUIRYDATA InquiryData;
 
     FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
 
@@ -874,6 +858,7 @@ USBSTOR_CreatePDO(
     PDO->StackSize = DeviceObject->StackSize;
 
     PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDO->DeviceExtension;
+    InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData;
 
     // initialize device extension
     RtlZeroMemory(PDODeviceExtension, sizeof(PDO_DEVICE_EXTENSION));
@@ -899,8 +884,8 @@ USBSTOR_CreatePDO(
         return Status;
     }
 
-    if (PDODeviceExtension->InquiryData->DeviceType != DIRECT_ACCESS_DEVICE &&
-        PDODeviceExtension->InquiryData->DeviceType != READ_ONLY_DIRECT_ACCESS_DEVICE)
+    if (InquiryData->DeviceType != DIRECT_ACCESS_DEVICE &&
+        InquiryData->DeviceType != READ_ONLY_DIRECT_ACCESS_DEVICE)
     {
         return STATUS_NOT_SUPPORTED;
     }