]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ACPI: sysfs: validate return type of _STR method
authorThomas Weißschuh <linux@weissschuh.net>
Tue, 9 Jul 2024 20:37:24 +0000 (22:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:08:01 +0000 (15:08 +0200)
commit 4bb1e7d027413835b086aed35bc3f0713bc0f72b upstream.

Only buffer objects are valid return values of _STR.

If something else is returned description_show() will access invalid
memory.

Fixes: d1efe3c324ea ("ACPI: Add new sysfs interface to export device description")
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240709-acpi-sysfs-groups-v2-1-058ab0667fa8@weissschuh.net
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/acpi/device_sysfs.c

index 566067a855a136b28291792087fd2e957021ed52..57ee8314dfb8a0c8767a3f6d6b05f34872183c57 100644 (file)
@@ -533,8 +533,9 @@ int acpi_device_setup_files(struct acpi_device *dev)
         * If device has _STR, 'description' file is created
         */
        if (acpi_has_method(dev->handle, "_STR")) {
-               status = acpi_evaluate_object(dev->handle, "_STR",
-                                       NULL, &buffer);
+               status = acpi_evaluate_object_typed(dev->handle, "_STR",
+                                                   NULL, &buffer,
+                                                   ACPI_TYPE_BUFFER);
                if (ACPI_FAILURE(status))
                        buffer.pointer = NULL;
                dev->pnp.str_obj = buffer.pointer;