Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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: 0b28cb4bcb17 ("HID: intel-ish-hid: ISH HID client driver")
Signed-off-by: Zhang Lixu <lixu.zhang@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

authored by

Zhang Lixu and committed by
Jiri Kosina
07583a00 82398784

+3 -1
+3 -1
drivers/hid/intel-ish-hid/ishtp-hid.c
··· 261 261 */ 262 262 void ishtp_hid_remove(struct ishtp_cl_data *client_data) 263 263 { 264 + void *data; 264 265 int i; 265 266 266 267 for (i = 0; i < client_data->num_hid_devices; ++i) { 267 268 if (client_data->hid_sensor_hubs[i]) { 268 - kfree(client_data->hid_sensor_hubs[i]->driver_data); 269 + data = client_data->hid_sensor_hubs[i]->driver_data; 269 270 hid_destroy_device(client_data->hid_sensor_hubs[i]); 271 + kfree(data); 270 272 client_data->hid_sensor_hubs[i] = NULL; 271 273 } 272 274 }