Commit 369bae4d authored by Zhang Lixu's avatar Zhang Lixu Committed by Pu Lehui
Browse files

HID: intel-ish-hid: Fix use-after-free issue in ishtp_hid_remove() 

stable inclusion
from stable-v6.6.83
commit 560f4d1299342504a6ab8a47f575b5e6b8345ada
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBY43Y
CVE: CVE-2025-21928

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=560f4d1299342504a6ab8a47f575b5e6b8345ada



--------------------------------

[ Upstream commit 07583a0010696a17fb0942e0b499a62785c5fc9f ]

The system can experience a random crash a few minutes after the driver is
removed. This issue occurs due to improper handling of memory freeing in
the ishtp_hid_remove() function.

The function currently frees the `driver_data` directly within the loop
that destroys the HID devices, which can lead to accessing freed memory.
Specifically, `hid_destroy_device()` uses `driver_data` when it calls
`hid_ishtp_set_feature()` to power off the sensor, so freeing
`driver_data` beforehand can result in accessing invalid memory.

This patch resolves the issue by storing the `driver_data` in a temporary
variable before calling `hid_destroy_device()`, and then freeing the
`driver_data` after the device is destroyed.

Fixes: 0b28cb4b ("HID: intel-ish-hid: ISH HID client driver")
Signed-off-by: default avatarZhang Lixu <lixu.zhang@intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarPu Lehui <pulehui@huawei.com>
parent 1e3f8fef

drivers/hid/intel-ish-hid/ishtp-hid.c

+3 −1
Original line number Diff line number Diff line
@@ -261,12 +261,14 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, 
 */

void ishtp_hid_remove(struct ishtp_cl_data *client_data)

{

	void *data;

	int i;



	for (i = 0; i < client_data->num_hid_devices; ++i) {

		if (client_data->hid_sensor_hubs[i]) {

			kfree(client_data->hid_sensor_hubs[i]->driver_data);

			data = client_data->hid_sensor_hubs[i]->driver_data;

			hid_destroy_device(client_data->hid_sensor_hubs[i]);

			kfree(data);

			client_data->hid_sensor_hubs[i] = NULL;

		}

	}