This is a note to let you know that I've just added the patch titled
HID: sony: Fix input device leak when connecting a DS4 twice using USB/BT
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hid-sony-fix-input-device-leak-when-connecting-a-ds4-twice-using-usb-bt.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a687c5765b5ae19fe559e14615ddc87ebb46d409 Mon Sep 17 00:00:00 2001
From: Roderick Colenbrander <roderick.colenbrander@xxxxxxxx>
Date: Fri, 24 Feb 2017 16:14:15 -0800
Subject: HID: sony: Fix input device leak when connecting a DS4 twice using USB/BT
From: Roderick Colenbrander <roderick.colenbrander@xxxxxxxx>
commit a687c5765b5ae19fe559e14615ddc87ebb46d409 upstream.
When a user connects a DS4 twice using USB and BT, we reject the
second device connection after the setup work. We then perform
a cleanup, but during cleanup we are not removing the touchpad
device. This leads to leakage of an input device, which we would
never remove. It can likely result into a kernel oops as well
when the touchpad evdev node is accessed and the underlaying HID
device has been removed from the system.
[jkosina@xxxxxxx: added stable annotation]
Fixes: ac797b95f532 ("HID: sony: Make the DS4 touchpad a separate device")
Signed-off-by: Roderick Colenbrander <roderick.colenbrander@xxxxxxxx>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/hid/hid-sony.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2632,6 +2632,8 @@ err_stop:
sony_leds_remove(sc);
if (sc->quirks & SONY_BATTERY_SUPPORT)
sony_battery_remove(sc);
+ if (sc->touchpad)
+ sony_unregister_touchpad(sc);
sony_cancel_work_sync(sc);
kfree(sc->output_report_dmabuf);
sony_remove_dev_list(sc);
Patches currently in stable-queue which might be from roderick.colenbrander@xxxxxxxx are
queue-4.10/hid-sony-fix-input-device-leak-when-connecting-a-ds4-twice-using-usb-bt.patch