Skip to contentSkip to conversation

HID: playstation: Clamp num_touch_reports

PATCH Applied T.J. Mercier 2 participants 3 messages Apr 17 – May 12

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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.

Fixes 752038248808 ("HID: playstation: add DualShock4 touchpad support.")
---
 drivers/hid/hid-playstation.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hid/hid-playstation.c +4 -2
index 3c0db8f93c82..8d06ddff356a 100644
@@ -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
maintainer Applied
#1 lore raw
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_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.

Quoted 4 lines
Fixes 752038248808 ("HID: playstation: add DualShock4 touchpad support.")

Applied, thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs
#2 lore raw
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_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.

Quoted 4 lines
Fixes 752038248808 ("HID: playstation: add DualShock4 touchpad support.")
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.