[SRU][O/P][PATCH 25/27] HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption
Aaron Ma
aaron.ma at canonical.com
Fri Jan 24 10:41:21 UTC 2025
From: Even Xu <even.xu at intel.com>
BugLink: https://bugs.launchpad.net/bugs/2096624
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 at intel.com>
Link: https://patch.msgid.link/20250113085047.2100403-1-even.xu@intel.com
Signed-off-by: Benjamin Tissoires <bentiss at kernel.org>
(cherry picked from commit d08a1049659aa91784306b7244116e71f569e5a0)
Signed-off-by: Aaron Ma <aaron.ma at canonical.com>
---
drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
index 0a3583fe2487..2a5eb03e18f0 100644
--- a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
+++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
@@ -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,
--
2.43.0
More information about the kernel-team
mailing list