[reactos] 01/01: [MOUNTMGR] Fix ReparseFile concatenation in OnlineMountedVolumes

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8525ce7a59a3251a8a5e…

commit b8525ce7a59a3251a8a5e624fe160f430fee36a9
Author:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
AuthorDate: Sun Nov 8 23:32:25 2020 +0300
Commit:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
CommitDate: Sun Nov 8 23:32:25 2020 +0300

    [MOUNTMGR] Fix ReparseFile concatenation in OnlineMountedVolumes
    
    - ReparseFile was concatenated with itself, instead of ReparseIndex
    - Meanwhile, use RtlAppendUnicodeStringToString for concatenating
      strings instead of raw memory operations
---
 drivers/storage/mountmgr/database.c | 48 +++++++++++++++++++------------------
 drivers/storage/mountmgr/device.c   | 15 +++++++-----
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/drivers/storage/mountmgr/database.c b/drivers/storage/mountmgr/database.c
index 1cde41a995f..118d37d1cfd 100644
--- a/drivers/storage/mountmgr/database.c
+++ b/drivers/storage/mountmgr/database.c
@@ -665,10 +665,12 @@ ReconcileThisDatabaseWithMasterWorker(IN PVOID Parameter)
     DatabaseHandle = OpenRemoteDatabase(DeviceInformation, FALSE);
 
     /* Prepare a string with reparse point index */
-    ReparseFile.Length = DeviceInformation->DeviceName.Length + ReparseIndex.Length;
-    ReparseFile.MaximumLength = ReparseFile.Length + sizeof(UNICODE_NULL);
+    ReparseFile.Length = 0;
+    ReparseFile.MaximumLength = DeviceInformation->DeviceName.Length
+                                + ReparseIndex.Length
+                                + sizeof(UNICODE_NULL);
     ReparseFile.Buffer = AllocatePool(ReparseFile.MaximumLength);
-    if (ReparseFile.Buffer == NULL)
+    if (!ReparseFile.Buffer)
     {
         if (DatabaseHandle != 0)
         {
@@ -678,10 +680,8 @@ ReconcileThisDatabaseWithMasterWorker(IN PVOID Parameter)
         goto ReleaseRDS;
     }
 
-    RtlCopyMemory(ReparseFile.Buffer, DeviceInformation->DeviceName.Buffer,
-                  DeviceInformation->DeviceName.Length);
-    RtlCopyMemory((PVOID)((ULONG_PTR)ReparseFile.Buffer +
DeviceInformation->DeviceName.Length),
-                  ReparseIndex.Buffer, ReparseIndex.Length);
+    RtlAppendUnicodeStringToString(&ReparseFile,
&DeviceInformation->DeviceName);
+    RtlAppendUnicodeStringToString(&ReparseFile, &ReparseIndex);
     ReparseFile.Buffer[ReparseFile.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
     InitializeObjectAttributes(&ObjectAttributes,
@@ -1477,18 +1477,18 @@ OnlineMountedVolumes(IN PDEVICE_EXTENSION DeviceExtension,
     }
 
     /* Prepare a string with reparse point index */
-    ReparseFile.Length = DeviceInformation->DeviceName.Length + ReparseIndex.Length;
-    ReparseFile.MaximumLength = ReparseFile.Length + sizeof(UNICODE_NULL);
+    ReparseFile.Length = 0;
+    ReparseFile.MaximumLength = DeviceInformation->DeviceName.Length
+                                + ReparseIndex.Length
+                                + sizeof(UNICODE_NULL);
     ReparseFile.Buffer = AllocatePool(ReparseFile.MaximumLength);
     if (!ReparseFile.Buffer)
     {
         return;
     }
 
-    RtlCopyMemory(ReparseFile.Buffer, DeviceInformation->DeviceName.Buffer,
-                  DeviceInformation->DeviceName.Length);
-    RtlCopyMemory((PVOID)((ULONG_PTR)ReparseFile.Buffer +
DeviceInformation->DeviceName.Length),
-                  ReparseFile.Buffer, ReparseFile.Length);
+    RtlAppendUnicodeStringToString(&ReparseFile,
&DeviceInformation->DeviceName);
+    RtlAppendUnicodeStringToString(&ReparseFile, &ReparseIndex);
     ReparseFile.Buffer[ReparseFile.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
     InitializeObjectAttributes(&ObjectAttributes,
@@ -1700,8 +1700,10 @@ CreateRemoteDatabaseWorker(IN PDEVICE_OBJECT DeviceObject,
     DeviceInformation = WorkItem->DeviceInformation;
 
     /* Reconstruct appropriate string */
-    DatabaseName.Length = DeviceInformation->DeviceName.Length +
RemoteDatabase.Length;
-    DatabaseName.MaximumLength = DatabaseName.Length + sizeof(WCHAR);
+    DatabaseName.Length = 0;
+    DatabaseName.MaximumLength = DeviceInformation->DeviceName.Length
+                                 + RemoteDatabase.Length
+                                 + sizeof(UNICODE_NULL);
     DatabaseName.Buffer = AllocatePool(DatabaseName.MaximumLength);
     if (DatabaseName.Buffer == NULL)
     {
@@ -1719,9 +1721,8 @@ CreateRemoteDatabaseWorker(IN PDEVICE_OBJECT DeviceObject,
     }
 
     /* Finish initiating strings */
-    RtlCopyMemory(DatabaseName.Buffer, DeviceInformation->DeviceName.Buffer,
DeviceInformation->DeviceName.Length);
-    RtlCopyMemory(DatabaseName.Buffer + (DeviceInformation->DeviceName.Length /
sizeof(WCHAR)),
-                  RemoteDatabase.Buffer, RemoteDatabase.Length);
+    RtlAppendUnicodeStringToString(&DatabaseName,
&DeviceInformation->DeviceName);
+    RtlAppendUnicodeStringToString(&DatabaseName, &RemoteDatabase);
     DatabaseName.Buffer[DatabaseName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
     /* Create database */
@@ -1846,17 +1847,18 @@ OpenRemoteDatabase(IN PDEVICE_INFORMATION DeviceInformation,
     Database = 0;
 
     /* Get database name */
-    DeviceRemoteDatabase.Length = DeviceInformation->DeviceName.Length +
RemoteDatabase.Length;
-    DeviceRemoteDatabase.MaximumLength = DeviceRemoteDatabase.Length + sizeof(WCHAR);
+    DeviceRemoteDatabase.Length = 0;
+    DeviceRemoteDatabase.MaximumLength = DeviceInformation->DeviceName.Length
+                                         + RemoteDatabase.Length
+                                         + sizeof(UNICODE_NULL);
     DeviceRemoteDatabase.Buffer = AllocatePool(DeviceRemoteDatabase.MaximumLength);
     if (!DeviceRemoteDatabase.Buffer)
     {
         return 0;
     }
 
-    RtlCopyMemory(DeviceRemoteDatabase.Buffer, DeviceInformation->DeviceName.Buffer,
DeviceInformation->DeviceName.Length);
-    RtlCopyMemory(DeviceRemoteDatabase.Buffer + (DeviceInformation->DeviceName.Length
/ sizeof(WCHAR)),
-                  RemoteDatabase.Buffer, RemoteDatabase.Length);
+    RtlAppendUnicodeStringToString(&DeviceRemoteDatabase,
&DeviceInformation->DeviceName);
+    RtlAppendUnicodeStringToString(&DeviceRemoteDatabase, &RemoteDatabase);
     DeviceRemoteDatabase.Buffer[DeviceRemoteDatabase.Length / sizeof(WCHAR)] =
UNICODE_NULL;
 
     /* Open database */
diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c
index 9b762890ea6..ecdb0b21526 100644
--- a/drivers/storage/mountmgr/device.c
+++ b/drivers/storage/mountmgr/device.c
@@ -1075,18 +1075,21 @@ MountMgrValidateBackPointer(IN PASSOCIATED_DEVICE_ENTRY
AssociatedDeviceEntry,
     PSYMLINK_INFORMATION SymlinkInformation;
 
     /* Initialize & allocate a string big enough to contain our complete mount point
name */
-    FullName.Length = AssociatedDeviceEntry->String.Length +
AssociatedDeviceEntry->DeviceInformation->DeviceName.Length + sizeof(WCHAR);
-    FullName.MaximumLength = FullName.Length + sizeof(UNICODE_NULL);
+    FullName.Length = 0;
+    FullName.MaximumLength = AssociatedDeviceEntry->String.Length
+                             +
AssociatedDeviceEntry->DeviceInformation->DeviceName.Length
+                             + sizeof(WCHAR)
+                             + sizeof(UNICODE_NULL);
     FullName.Buffer = AllocatePool(FullName.MaximumLength);
     if (!FullName.Buffer)
     {
         return STATUS_INSUFFICIENT_RESOURCES;
     }
 
-    /* Create the path  */
-    RtlCopyMemory(FullName.Buffer,
AssociatedDeviceEntry->DeviceInformation->DeviceName.Buffer,
AssociatedDeviceEntry->DeviceInformation->DeviceName.Length);
-    FullName.Buffer[AssociatedDeviceEntry->DeviceInformation->DeviceName.Length /
sizeof(WCHAR)] = L'\\';
-   
RtlCopyMemory(&FullName.Buffer[AssociatedDeviceEntry->DeviceInformation->DeviceName.Length
/ sizeof(WCHAR) + 1], AssociatedDeviceEntry->String.Buffer,
AssociatedDeviceEntry->String.Length);
+    /* Create the path */
+    RtlAppendUnicodeStringToString(&FullName,
&AssociatedDeviceEntry->DeviceInformation->DeviceName);
+    FullName.Buffer[FullName.Length / sizeof(WCHAR)] = L'\\';
+    RtlAppendUnicodeStringToString(&FullName,
&AssociatedDeviceEntry->String);
     FullName.Buffer[FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
 
     /* Open it to query the reparse point */