mirror of
https://github.com/torvalds/linux.git
synced 2026-10-10 12:28:02 +02:00
HID: nintendo: stop device IO before hid_hw_stop on probe failure
nintendo_hid_probe() calls hid_device_io_start() before joycon_init()
and joycon_leds_create(). If either fails, the error path jumps to
err_close which calls hid_hw_close()/hid_hw_stop() without first calling
hid_device_io_stop().
hid_hw_stop() does not stop device IO, so hid_input_report() may still
run and access driver data that is being torn down, resulting in a
use-after-free.
Add an err_io_stop label that calls hid_device_io_stop() before
hid_hw_close(), and point the two post-io_start error paths at it.
Fixes: 2af16c1f84 ("HID: nintendo: add nintendo switch controller driver")
Cc: stable@vger.kernel.org
Signed-off-by: Jiangshan Yi <yijiangshan@kylinos.cn>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
This commit is contained in:
parent
bf3e39df3a
commit
1f74d3bff6
|
|
@ -2736,14 +2736,14 @@ static int nintendo_hid_probe(struct hid_device *hdev,
|
|||
ret = joycon_init(hdev);
|
||||
if (ret) {
|
||||
hid_err(hdev, "Failed to initialize controller; ret=%d\n", ret);
|
||||
goto err_close;
|
||||
goto err_io_stop;
|
||||
}
|
||||
|
||||
/* Initialize the leds */
|
||||
ret = joycon_leds_create(ctlr);
|
||||
if (ret) {
|
||||
hid_err(hdev, "Failed to create leds; ret=%d\n", ret);
|
||||
goto err_close;
|
||||
goto err_io_stop;
|
||||
}
|
||||
|
||||
/* Initialize the battery power supply */
|
||||
|
|
@ -2766,7 +2766,8 @@ static int nintendo_hid_probe(struct hid_device *hdev,
|
|||
|
||||
err_ida:
|
||||
ida_free(&nintendo_player_id_allocator, ctlr->player_id);
|
||||
err_close:
|
||||
err_io_stop:
|
||||
hid_device_io_stop(hdev);
|
||||
hid_hw_close(hdev);
|
||||
err_stop:
|
||||
hid_hw_stop(hdev);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user