Commit d08a1049 authored by Even Xu's avatar Even Xu Committed by Benjamin Tissoires
Browse files

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



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

Fixes: 5282e45c ("HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C ACPI interfaces")
Signed-off-by: default avatarEven Xu <even.xu@intel.com>
Link: https://patch.msgid.link/20250113085047.2100403-1-even.xu@intel.com


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent 0b0d62fa

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

+4 −1
Original line number Diff line number Diff line
@@ -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,