Fix IRP_MJ_QUERY_INFORMATION/FileStandardInformation (current code was trying to...

Replace MmGetSystemAddressForMdl by MmGetSystemAddressForMdlSafe

svn path=/trunk/; revision=17514

diff --git a/reactos/drivers/dd/serial/devctrl.c b/reactos/drivers/dd/serial/devctrl.c
index 3034b12..910e347 100644 (file)
--- a/reactos/drivers/dd/serial/devctrl.c
+++ b/reactos/drivers/dd/serial/devctrl.c
@@ -31,7 +31,7 @@ SerialGetUserBuffers(
                case METHOD_IN_DIRECT:
                case METHOD_OUT_DIRECT:
                        *BufferIn = Irp->AssociatedIrp.SystemBuffer;
-                       *BufferOut = MmGetSystemAddressForMdl(Irp->MdlAddress);
+                       *BufferOut = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority);
                        break;
                case METHOD_NEITHER:
                        *BufferIn = IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.Type3InputBuffer;

diff --git a/reactos/drivers/dd/serial/info.c b/reactos/drivers/dd/serial/info.c
index 9443f81..e3f7f15 100644 (file)
--- a/reactos/drivers/dd/serial/info.c
+++ b/reactos/drivers/dd/serial/info.c
@@ -38,6 +38,7 @@ SerialQueryInformation(
                                Status = STATUS_BUFFER_OVERFLOW;
                        else if (!StandardInfo)
                                Status = STATUS_INVALID_PARAMETER;
+                       else
                        {
                                StandardInfo->AllocationSize.QuadPart = 0;
                                StandardInfo->EndOfFile.QuadPart = 0;

diff --git a/reactos/drivers/dd/serial/pnp.c b/reactos/drivers/dd/serial/pnp.c
index 6729a21..6ca35ef 100644 (file)
--- a/reactos/drivers/dd/serial/pnp.c
+++ b/reactos/drivers/dd/serial/pnp.c
@@ -274,7 +274,7 @@ SerialPnpStartDevice(
        if (NT_SUCCESS(Status))
        {
                /* Key = \Device\Serialx, Value = COMx */
-               ZwSetValueKey(hKey, &DeviceName, 0, REG_SZ, &ComPortBuffer, ComPort.Length + sizeof(WCHAR));
+               ZwSetValueKey(hKey, &DeviceName, 0, REG_SZ, ComPortBuffer, ComPort.Length + sizeof(WCHAR));
                ZwClose(hKey);
        }