Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56cfa64b authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Siarhei Vishniakou
Browse files

UPSTREAM: HID: sony: Fix memory corruption issue on cleanup. 



The sony driver is not properly cleaning up from potential failures in
sony_input_configured. Currently it calls hid_hw_stop, while hid_connect
is still running. This is not a good idea, instead hid_hw_stop should
be moved to sony_probe. Similar changes were recently made to Logitech
drivers, which were also doing improper cleanup.

Signed-off-by: default avatarRoderick Colenbrander <roderick.colenbrander@sony.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>

Bug: 139372370
Change-Id: I97dadab125a6a426763efd3beb939ddca017c6b6
(cherry picked from commit 2bcdacb70327013ca2066bfcf2af1009eff01f1d
("HID: sony: Fix memory corruption issue on cleanup."))
Signed-off-by: default avatarSiarhei Vishniakou <svv@google.com>
parent 5bf3ad5c

drivers/hid/hid-sony.c

+1 −1
Original line number Diff line number Diff line
@@ -2716,7 +2716,6 @@ static int sony_input_configured(struct hid_device *hdev, 
	kfree(sc->output_report_dmabuf);

	sony_remove_dev_list(sc);

	sony_release_device_id(sc);

	hid_hw_stop(hdev);

	return ret;

}
@@ -2778,6 +2777,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	 */

	if (!(hdev->claimed & HID_CLAIMED_INPUT)) {

		hid_err(hdev, "failed to claim input\n");

		hid_hw_stop(hdev);

		return -ENODEV;

	}