[MOUNTMGR] Introduce MountMgrSendSyncDeviceIoCtl() to replace repeate…

…d code (reactos#6960) See https://www.osr.com/blog/2018/02/14/beware-iobuilddeviceiocontrolrequest/ for some details about IRQL requirements.
xxxmen · Jun 13, 2024 · ab0e04c · ab0e04c
1 parent 5027194
commit ab0e04c
Show file tree

Hide file tree

Showing 5 changed files with 234 additions and 448 deletions.
diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c
@@ -330,11 +330,8 @@ MountMgrCheckUnprocessedVolumes(IN PDEVICE_EXTENSION DeviceExtension,
 BOOLEAN
 IsFtVolume(IN PUNICODE_STRING SymbolicName)
 {
-    PIRP Irp;
-    KEVENT Event;
     NTSTATUS Status;
     PFILE_OBJECT FileObject;
-    IO_STATUS_BLOCK IoStatusBlock;
     PARTITION_INFORMATION PartitionInfo;
     PDEVICE_OBJECT DeviceObject, FileDeviceObject;
 
@@ -344,9 +341,7 @@ IsFtVolume(IN PUNICODE_STRING SymbolicName)
                                       &FileObject,
                                       &DeviceObject);
     if (!NT_SUCCESS(Status))
-    {
         return FALSE;
-    }
 
     /* Get attached device */
     FileDeviceObject = FileObject->DeviceObject;
@@ -363,34 +358,17 @@ IsFtVolume(IN PUNICODE_STRING SymbolicName)
     ObDereferenceObject(FileObject);
 
     /* Get partition information */
-    KeInitializeEvent(&Event, NotificationEvent, FALSE);
-    Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO,
-                                        DeviceObject,
-                                        NULL,
-                                        0,
-                                        &PartitionInfo,
-                                        sizeof(PartitionInfo),
-                                        FALSE,
-                                        &Event,
-                                        &IoStatusBlock);
-    if (!Irp)
-    {
-        ObDereferenceObject(DeviceObject);
-        return FALSE;
-    }
-
-    Status = IoCallDriver(DeviceObject, Irp);
-    if (Status == STATUS_PENDING)
-    {
-        KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
-        Status = IoStatusBlock.Status;
-    }
+    Status = MountMgrSendSyncDeviceIoCtl(IOCTL_DISK_GET_PARTITION_INFO,
+                                         DeviceObject,
+                                         NULL,
+                                         0,
+                                         &PartitionInfo,
+                                         sizeof(PartitionInfo),
+                                         NULL);
 
     ObDereferenceObject(DeviceObject);
     if (!NT_SUCCESS(Status))
-    {
         return FALSE;
-    }
 
     /* Check if this is a FT volume */
     return IsFTPartition(PartitionInfo.PartitionType);

diff --git a/drivers/storage/mountmgr/mntmgr.h b/drivers/storage/mountmgr/mntmgr.h
@@ -179,6 +179,17 @@ extern LONG Unloading;
 CODE_SEG("INIT")
 DRIVER_INITIALIZE DriverEntry;
 
+_IRQL_requires_(PASSIVE_LEVEL)
+NTSTATUS
+MountMgrSendSyncDeviceIoCtl(
+    _In_ ULONG IoControlCode,
+    _In_ PDEVICE_OBJECT DeviceObject,
+    _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer,
+    _In_ ULONG InputBufferLength,
+    _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer,
+    _In_ ULONG OutputBufferLength,
+    _In_opt_ PFILE_OBJECT FileObject);
+
 VOID
 NTAPI
 MountMgrCancel(