| From 2bcdacb70327013ca2066bfcf2af1009eff01f1d Mon Sep 17 00:00:00 2001 |
| From: Roderick Colenbrander <roderick.colenbrander@sony.com> |
| Date: Wed, 4 Sep 2019 14:22:11 -0700 |
| Subject: HID: sony: Fix memory corruption issue on cleanup. |
| |
| From: Roderick Colenbrander <roderick.colenbrander@sony.com> |
| |
| commit 2bcdacb70327013ca2066bfcf2af1009eff01f1d upstream. |
| |
| 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: Roderick Colenbrander <roderick.colenbrander@sony.com> |
| CC: stable@vger.kernel.org |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/hid-sony.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/hid/hid-sony.c |
| +++ b/drivers/hid/hid-sony.c |
| @@ -2811,7 +2811,6 @@ err_stop: |
| sony_cancel_work_sync(sc); |
| sony_remove_dev_list(sc); |
| sony_release_device_id(sc); |
| - hid_hw_stop(hdev); |
| return ret; |
| } |
| |
| @@ -2876,6 +2875,7 @@ static int sony_probe(struct hid_device |
| */ |
| if (!(hdev->claimed & HID_CLAIMED_INPUT)) { |
| hid_err(hdev, "failed to claim input\n"); |
| + hid_hw_stop(hdev); |
| return -ENODEV; |
| } |
| |
