diff options
| author | Even Xu <even.xu@intel.com> | 2025-01-13 11:50:47 +0300 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2025-01-13 12:48:20 +0300 |
| commit | d08a1049659aa91784306b7244116e71f569e5a0 (patch) | |
| tree | e144f6399047c938cbfb54830f16aa2033533e7f | |
| parent | 0b0d62fa73f22884e1ddd4ed6e288f959ad116ae (diff) | |
| download | linux-d08a1049659aa91784306b7244116e71f569e5a0.tar.xz | |
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")
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>
| -rw-r--r-- | drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 b56c72124821..2de93f4a25ca 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, |