HID: playstation: Clamp num_touch_reports
Subsystems (3)
PATCH 1/1 HID: playstation: Clamp num_touch_reports
A device would never lie about the number of touch reports would it?
If it does the loop in dualshock4_parse_report will read off the end of the touch_reports array, up to about 2 KiB for the maximum number of 256 loop iteraions. The data that is read is emitted via evdev if the DS4_TOUCH_POINT_INACTIVE bit happens to be set. Protect against this by clamping the num_touch_reports value provided by the device to the maximum size of the touch_reports array.
--- drivers/hid/hid-playstation.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hid/hid-playstation.c +4 -2
@@ -2378,7 +2378,8 @@ static int dualshock4_parse_report(struct ps_device *ps_dev, struct hid_report * (struct dualshock4_input_report_usb *)data; ds4_report = &usb->common; - num_touch_reports = usb->num_touch_reports; + num_touch_reports =min_t (u8, usb->num_touch_reports, +ARRAY_SIZE (usb->touch_reports)); touch_reports = usb->touch_reports; }else if (hdev->bus ==BUS_BLUETOOTH && report->id ==DS4_INPUT_REPORT_BT && size ==DS4_INPUT_REPORT_BT_SIZE ) {
@@ -2392,7 +2393,8 @@ static int dualshock4_parse_report(struct ps_device *ps_dev, struct hid_report * } ds4_report = &bt->common; - num_touch_reports = bt->num_touch_reports; + num_touch_reports =min_t (u8, bt->num_touch_reports, +ARRAY_SIZE (bt->touch_reports)); touch_reports = bt->touch_reports; } else if (hdev->bus == BUS_BLUETOOTH && report->id == DS4_INPUT_REPORT_BT_MINIMAL &&
base-commit: 3cd8b194bf3428dfa53120fee47e827a7c495815
Signature · 1 line
2.54.0.rc1.513.gad8abe7a5a-goog
Quoted 9 lines · T.J. Mercier
A device would never lie about the number of touch reports would it?
If it does the loop in
dualshock4_parse_reportwill read off the end of thetouch_reportsarray, up to about 2 KiB for the maximum number of 256 loop iteraions. The data that is read is emitted via evdev if theDS4_TOUCH_POINT_INACTIVEbit happens to be set. Protect against this by clamping thenum_touch_reportsvalue provided by the device to the maximum size of thetouch_reportsarray.
Quoted 4 lines
Fixes 752038248808 ("HID: playstation: add DualShock4 touchpad support.")Reported-by Xingyu Jin <[email protected]>Signed-off-by T.J. Mercier <[email protected]>
Applied, thanks.
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 17 lines · Jiri Kosina
Quoted 9 lines · T.J. Mercier
A device would never lie about the number of touch reports would it?
If it does the loop in
dualshock4_parse_reportwill read off the end of thetouch_reportsarray, up to about 2 KiB for the maximum number of 256 loop iteraions. The data that is read is emitted via evdev if theDS4_TOUCH_POINT_INACTIVEbit happens to be set. Protect against this by clamping thenum_touch_reportsvalue provided by the device to the maximum size of thetouch_reportsarray.Quoted 4 lines
Fixes 752038248808 ("HID: playstation: add DualShock4 touchpad support.")Reported-by Xingyu Jin <[email protected]>Signed-off-by T.J. Mercier <[email protected]>
Quoted 5 lines
Applied, thanks.
--
Jiri Kosina
SUSE Labs
Hi Jiri,
Thanks for applying this. However now I see that a different fix from Benoît Sevens from around the same time has landed:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=82a4fc46330910b4c1d9b189561439d468e3ff11
That fix was not yet present at 3cd8b194bf3428dfa53120fee47e827a7c495815 which I used as my base.
His patch prints and returns an error in this situation while mine silently avoids the OOB read.
So I think it probably makes sense to keep Benoît's patch, and drop mine since his code means mine will never be reached.
Thanks,
T.J.