]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption
authorEven Xu <even.xu@intel.com>
Mon, 13 Jan 2025 08:50:47 +0000 (16:50 +0800)
committerBenjamin Tissoires <bentiss@kernel.org>
Mon, 13 Jan 2025 09:48:20 +0000 (10:48 +0100)
Use U32 to get value from ACPI and explicitly cast to U16.

Fixes: 5282e45ccbfa ("HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C ACPI interfaces")
Signed-off-by: Even Xu <even.xu@intel.com>
Link: https://patch.msgid.link/20250113085047.2100403-1-even.xu@intel.com
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

index b56c72124821fd17ea34fe7b3e6f9b62945ea9cd..2de93f4a25ca4e2268af44562924aeabc1cfeaf4 100644 (file)
@@ -118,6 +118,7 @@ static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev)
        struct acpi_device *adev = ACPI_COMPANION(qcdev->dev);
        struct quicki2c_subip_acpi_parameter i2c_param;
        struct quicki2c_subip_acpi_config i2c_config;
+       u32 hid_desc_addr;
        int ret = -EINVAL;
 
        if (!adev) {
@@ -131,10 +132,12 @@ static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev)
                                             QUICKI2C_ACPI_REVISION_NUM,
                                             QUICKI2C_ACPI_FUNC_NUM_HID_DESC_ADDR,
                                             ACPI_TYPE_INTEGER,
-                                            &qcdev->hid_desc_addr);
+                                            &hid_desc_addr);
        if (ret)
                return ret;
 
+       qcdev->hid_desc_addr = (u16)hid_desc_addr;
+
        ret = quicki2c_acpi_get_dsm_property(adev, &thc_platform_guid,
                                             QUICKI2C_ACPI_REVISION_NUM,
                                             QUICKI2C_ACPI_FUNC_NUM_ACTIVE_LTR_VAL,