Skip to contentSkip to conversation

HID: sony: add missing size validation for SMK-Link remotes

PATCH Applied Rosalie Wanders 2 participants 2 messages Apr 12 – Apr 28 HID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HID: sony: add missing size validation for SMK-Link remotes

This commit adds the missing size validation for SMK-Link remotes in sony_raw_event(), this prevents a malicious device from allowing hid-sony to read out of bounds of the provided buffer.

I do not own these devices so the size check only forces that the buffer is large enough for nsg_mrxu_parse_report().

---
 drivers/hid/hid-sony.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/hid/hid-sony.c +2 -3
index ad394ac57fa5..2260d55a17b0 100644
@@ -1169,10 +1169,9 @@ static int sony_raw_event(struct hid_device *hdev, struct hid_report *report,
 		sixaxis_parse_report(sc, rd, size);
 	} else if ((sc->quirks & MOTION_CONTROLLER_BT) && rd[0] == 0x01 && size == 49) {
 		sixaxis_parse_report(sc, rd, size);
-	} else if ((sc->quirks & NAVIGATION_CONTROLLER) && rd[0] == 0x01 &&
-			size == 49) {
+	} else if ((sc->quirks & NAVIGATION_CONTROLLER) && rd[0] == 0x01 && size == 49) {
 		sixaxis_parse_report(sc, rd, size);
-	} else if ((sc->quirks & NSG_MRXU_REMOTE) && rd[0] == 0x02) {
+	} else if ((sc->quirks & NSG_MRXU_REMOTE) && rd[0] == 0x02 && size >= 12) {
 		nsg_mrxu_parse_report(sc, rd, size);
 		return 1;
 	} else if ((sc->quirks & RB4_GUITAR_PS4_USB) && rd[0] == 0x01 && size == 64) {
Signature · 1 line
2.53.0
maintainer Applied
#1 lore raw
Quoted 6 lines · Rosalie Wanders

This commit adds the missing size validation for SMK-Link remotes in sony_raw_event(), this prevents a malicious device from allowing hid-sony to read out of bounds of the provided buffer.

I do not own these devices so the size check only forces that the buffer is large enough for nsg_mrxu_parse_report().

Applied to hid.git#for-7.1/upstream-fixes, thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs