HID: corsair-void: Check size of status and firmware events before reading them
Subsystems (2)
PATCH v2 1/1 HID: corsair-void: Check size of status and firmware events before reading them
Malformed status and firmware events could cause an out-of-bounds read since the size wasn't being checked. Check the size and warn on unexpected values to avoid this.
Fixes 6ea2a6fd3872 ("HID: corsair-void: Add Corsair Void headset family driver")
Signed-off-by Stuart Hayhurst <[email protected]>
---
v1 -> v2:
- Ratelimit the warnings
- Accept packets larger than the expected size
--- drivers/hid/hid-corsair-void.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/hid/hid-corsair-void.c +17 -0
@@ -92,6 +92,9 @@#define CORSAIR_VOID_STATUS_REPORT_ID 0x64#define CORSAIR_VOID_FIRMWARE_REPORT_ID 0x66 +#define CORSAIR_VOID_STATUS_REPORT_SIZE 5 +#define CORSAIR_VOID_FIRMWARE_REPORT_SIZE 5 +#define CORSAIR_VOID_USB_SIDETONE_REQUEST 0x1#define CORSAIR_VOID_USB_SIDETONE_REQUEST_TYPE 0x21#define CORSAIR_VOID_USB_SIDETONE_VALUE 0x200
@@ -742,6 +745,13 @@ static int corsair_void_raw_event(struct hid_device *hid_dev,/* Description of packets are documented at the top of this file */ if (hid_report->id ==CORSAIR_VOID_STATUS_REPORT_ID ) { +if (size <CORSAIR_VOID_STATUS_REPORT_SIZE ) { +hid_warn_ratelimited (hid_dev, +"unexpected status report of size %d" , + size); +return 1 ; + } + drvdata->mic_up =FIELD_GET (CORSAIR_VOID_MIC_MASK , data[2 ]); drvdata->connected = (data[3 ] ==CORSAIR_VOID_WIRELESS_CONNECTED ) || drvdata->is_wired;
@@ -750,6 +760,13 @@ static int corsair_void_raw_event(struct hid_device *hid_dev,FIELD_GET (CORSAIR_VOID_CAPACITY_MASK , data[2 ]), data[3], data[4]); }else if (hid_report->id ==CORSAIR_VOID_FIRMWARE_REPORT_ID ) { +if (size <CORSAIR_VOID_FIRMWARE_REPORT_SIZE ) { +hid_warn_ratelimited (hid_dev, +"unexpected firmware report of size %d" , + size); +return 1 ; + } + drvdata->fw_receiver_major = data[1 ]; drvdata->fw_receiver_minor = data[2 ]; drvdata->fw_headset_major = data[3 ];
Signature · 1 line
2.53.0
Quoted 7 lines · Stuart Hayhurst
Malformed status and firmware events could cause an out-of-bounds read since the size wasn't being checked. Check the size and warn on unexpected values to avoid this.
Fixes 6ea2a6fd3872 ("HID: corsair-void: Add Corsair Void headset family driver")Signed-off-by Stuart Hayhurst <[email protected]>
Applied, thanks.
Signature · 2 lines
Jiri Kosina SUSE Labs