Skip to contentSkip to conversation

HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption

PATCH Applied Even Xu 2 participants 3 messages Jan 13, 2025 – Jan 14, 2025

Subsystems (3)
lore
Share & tools
lore

Even Xu

author maintainer
#0 lore raw

PATCH 1/1 HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption

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")
---
 drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c +4 -1
index b56c72124821..2de93f4a25ca 100644
@@ -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,
Signature · 1 line
2.40.1
author maintainer
#2 lore raw

Thanks Benjamin!

Best Regards,
Even Xu

Quoted 23 lines

-----Original Message-----
From: Benjamin Tissoires <[email protected]>
Sent: Monday, January 13, 2025 6:09 PM
To: [email protected]; Xu, Even <[email protected]>
Cc: [email protected]; [email protected]; mpearson- [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH next] HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption

Quoted 3 lines · Even Xu

Use U32 to get value from ACPI and explicitly cast to U16.

Applied to hid/hid.git (for-6.14/intel-thc), thanks!

[1/1] HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption

      https://git.kernel.org/hid/hid/c/d08a1049659a

Cheers,
--
Benjamin Tissoires <[email protected]>