hidclass.sys: Return STATUS_INVALID_USER_BUFFER when appropriate.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

hidclass.sys: Return STATUS_INVALID_USER_BUFFER when appropriate.
9c5ab964 · Rémi Bernon · Alexandre Julliard · 6f4ccd04 · 9c5ab964 · 9c5ab964
Commit 9c5ab964 authored Aug 03, 2021 by Rémi Bernon Committed by Alexandre Julliard Aug 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

device.c dlls/hidclass.sys/device.c +6 -1

ntoskrnl.c dlls/ntoskrnl.exe/tests/ntoskrnl.c +1 -1

No files found.
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -499,7 +499,12 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)
            BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority);
            ULONG out_length;

-            if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !buffer)
+            if (!buffer)
+            {
+                irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER;
+                break;
+            }
+            if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength)
            {
                irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL;
                break;

--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -2441,7 +2441,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled
    SetLastError(0xdeadbeef);
    ret = HidD_GetInputReport(file, report, 0);
    ok(!ret, "HidD_GetInputReport succeeded\n");
-    todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError());

    SetLastError(0xdeadbeef);
    ret = HidD_GetInputReport(file, report, caps.InputReportByteLength - 1);