]> www.infradead.org Git - users/willy/xarray.git/commitdiff
platform/x86: asus-wmi: Potential buffer overflow in asus_wmi_evaluate_method_buf()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 13 Apr 2022 07:37:44 +0000 (10:37 +0300)
committerHans de Goede <hdegoede@redhat.com>
Wed, 27 Apr 2022 14:55:54 +0000 (16:55 +0200)
This code tests for if the obj->buffer.length is larger than the buffer
but then it just does the memcpy() anyway.

Fixes: 0f0ac158d28f ("platform/x86: asus-wmi: Add support for custom fan curves")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20220413073744.GB8812@kili
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/x86/asus-wmi.c

index 2104a2621e5070e1c963576b77e29c7afff06e4d..7e3c0a8e39975e3af1c9e53921fdb5352c579bd5 100644 (file)
@@ -371,10 +371,14 @@ static int asus_wmi_evaluate_method_buf(u32 method_id,
 
        switch (obj->type) {
        case ACPI_TYPE_BUFFER:
-               if (obj->buffer.length > size)
+               if (obj->buffer.length > size) {
                        err = -ENOSPC;
-               if (obj->buffer.length == 0)
+                       break;
+               }
+               if (obj->buffer.length == 0) {
                        err = -ENODATA;
+                       break;
+               }
 
                memcpy(ret_buffer, obj->buffer.pointer, obj->buffer.length);
                break;