Skip to content

Commit d08a104

Browse files
EvenxfBenjamin Tissoires
authored andcommitted
HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption
Use U32 to get value from ACPI and explicitly cast to U16. Fixes: 5282e45 ("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>
1 parent 0b0d62f commit d08a104

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev)
118118
struct acpi_device *adev = ACPI_COMPANION(qcdev->dev);
119119
struct quicki2c_subip_acpi_parameter i2c_param;
120120
struct quicki2c_subip_acpi_config i2c_config;
121+
u32 hid_desc_addr;
121122
int ret = -EINVAL;
122123

123124
if (!adev) {
@@ -131,10 +132,12 @@ static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev)
131132
QUICKI2C_ACPI_REVISION_NUM,
132133
QUICKI2C_ACPI_FUNC_NUM_HID_DESC_ADDR,
133134
ACPI_TYPE_INTEGER,
134-
&qcdev->hid_desc_addr);
135+
&hid_desc_addr);
135136
if (ret)
136137
return ret;
137138

139+
qcdev->hid_desc_addr = (u16)hid_desc_addr;
140+
138141
ret = quicki2c_acpi_get_dsm_property(adev, &thc_platform_guid,
139142
QUICKI2C_ACPI_REVISION_NUM,
140143
QUICKI2C_ACPI_FUNC_NUM_ACTIVE_LTR_VAL,

0 commit comments

Comments
 (0)