Skip to contentSkip to conversation

HID: core: Mitigate potential OOB by removing bogus memset()

PATCH In review Wenshan Lan 3 participants 4 messages Jun 3 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HID: core: Mitigate potential OOB by removing bogus memset()

From: Lee Jones <[email protected]>

[ Upstream commit 0a3fe972a7cb1404f693d6f1711f32bc1d244b1c ]

The memset() in hid_report_raw_event() has the good intention of clearing out bogus data by zeroing the area from the end of the incoming data string to the assumed end of the buffer. However, as we have previously seen, doing so can easily result in OOB reads and writes in the subsequent thread of execution.

The current suggestion from one of the HID maintainers is to remove the memset() and simply return if the incoming event buffer size is not large enough to fill the associated report.

Suggested-by Benjamin Tissoires <[email protected]>

[bentiss: changed the return value]
[ Replace hid_warn_ratelimited() with hid_warn() in v6.12. ]
---
 drivers/hid/hid-core.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/hid/hid-core.c +4 -3
index 294a25330ed0..6d61bf20ec3f 100644
@@ -2029,9 +2029,10 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 *
 		rsize = max_buffer_size;
 
 	if (csize < rsize) {
-		dbg_hid("report %d is too short, (%d < %d)\n", report->id,
-				csize, rsize);
-		memset(cdata + csize, 0, rsize - csize);
+		hid_warn(hid, "Event data for report %d was too short (%d vs %d)\n",
+			 report->id, rsize, csize);
+		ret = -EINVAL;
+		goto out;
 	}
 
 	if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)
Signature · 1 line
2.43.0
#1 lore raw
Quoted 14 lines · Wenshan Lan

From: Lee Jones <[email protected]>

[ Upstream commit 0a3fe972a7cb1404f693d6f1711f32bc1d244b1c ]

The memset() in hid_report_raw_event() has the good intention of clearing out bogus data by zeroing the area from the end of the incoming data string to the assumed end of the buffer. However, as we have previously seen, doing so can easily result in OOB reads and writes in the subsequent thread of execution.

The current suggestion from one of the HID maintainers is to remove the memset() and simply return if the incoming event buffer size is not large enough to fill the associated report.

Quoted 8 lines

Suggested-by Benjamin Tissoires <[email protected]>

[bentiss: changed the return value]
[ Replace hid_warn_ratelimited() with hid_warn() in v6.12. ]

---

This commit is known for breaking devices. You can't backport this without the following 3 fixes:
4d3a2a466b8d ("HID: core: Fix size_t specifier in hid_report_raw_event()") 206342541fc8 ("HID: core: introduce hid_safe_input_report()") 2c85c61d1332 ("HID: pass the buffer size to hid_report_raw_event")

Note that this is the same for your 6.6, 6.1 and 5.15 patches.

Cheers,
Benjamin

Quoted 25 lines
 drivers/hid/hid-core.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/hid/hid-core.c +4 -3
index 294a25330ed0..6d61bf20ec3f 100644
@@ -2029,9 +2029,10 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 *
 		rsize = max_buffer_size;
 
 	if (csize < rsize) {
-		dbg_hid("report %d is too short, (%d < %d)\n", report->id,
-				csize, rsize);
-		memset(cdata + csize, 0, rsize - csize);
+		hid_warn(hid, "Event data for report %d was too short (%d vs %d)\n",
+			 report->id, rsize, csize);
+		ret = -EINVAL;
+		goto out;
 	}
 
 	if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)
Signature · 1 line
2.43.0
#2 lore raw
Quoted 23 lines · Benjamin Tissoires
Quoted 14 lines · Wenshan Lan

From: Lee Jones <[email protected]>

[ Upstream commit 0a3fe972a7cb1404f693d6f1711f32bc1d244b1c ]

The memset() in hid_report_raw_event() has the good intention of clearing out bogus data by zeroing the area from the end of the incoming data string to the assumed end of the buffer. However, as we have previously seen, doing so can easily result in OOB reads and writes in the subsequent thread of execution.

The current suggestion from one of the HID maintainers is to remove the memset() and simply return if the incoming event buffer size is not large enough to fill the associated report.

Quoted 8 lines

Suggested-by Benjamin Tissoires <[email protected]>

[bentiss: changed the return value]
[ Replace hid_warn_ratelimited() with hid_warn() in v6.12. ]

---

Quoted 7 lines

This commit is known for breaking devices. You can't backport this without the following 3 fixes:
4d3a2a466b8d ("HID: core: Fix size_t specifier in hid_report_raw_event()") 206342541fc8 ("HID: core: introduce hid_safe_input_report()") 2c85c61d1332 ("HID: pass the buffer size to hid_report_raw_event")

Note that this is the same for your 6.6, 6.1 and 5.15 patches.

Thanks for your suggestion, I will send a V2 later.

Wenshan

Quoted 29 lines

Cheers,
Benjamin

Quoted 25 lines
  drivers/hid/hid-core.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
drivers/hid/hid-core.c +4 -3
index 294a25330ed0..6d61bf20ec3f 100644
@@ -2029,9 +2029,10 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 *
  		rsize = max_buffer_size;
 
  	if (csize < rsize) {
-		dbg_hid("report %d is too short, (%d < %d)\n", report->id,
-				csize, rsize);
-		memset(cdata + csize, 0, rsize - csize);
+		hid_warn(hid, "Event data for report %d was too short (%d vs %d)\n",
+			 report->id, rsize, csize);
+		ret = -EINVAL;
+		goto out;
  	}
 
  	if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)
Signature · 1 line
2.43.0
#3 lore raw
Quoted 31 lines · Wenshan Lan
Quoted 29 lines · Benjamin Tissoires
Quoted 14 lines · Wenshan Lan

From: Lee Jones <[email protected]>

[ Upstream commit 0a3fe972a7cb1404f693d6f1711f32bc1d244b1c ]

The memset() in hid_report_raw_event() has the good intention of clearing out bogus data by zeroing the area from the end of the incoming data string to the assumed end of the buffer. However, as we have previously seen, doing so can easily result in OOB reads and writes in the subsequent thread of execution.

The current suggestion from one of the HID maintainers is to remove the memset() and simply return if the incoming event buffer size is not large enough to fill the associated report.

Quoted 8 lines

Suggested-by Benjamin Tissoires <[email protected]>

[bentiss: changed the return value]
[ Replace hid_warn_ratelimited() with hid_warn() in v6.12. ]

---

This commit is known for breaking devices. You can't backport this without the following 3 fixes:
4d3a2a466b8d ("HID: core: Fix size_t specifier in hid_report_raw_event()") 206342541fc8 ("HID: core: introduce hid_safe_input_report()") 2c85c61d1332 ("HID: pass the buffer size to hid_report_raw_event")

Quoted 3 lines
Quoted 1 line

Note that this is the same for your 6.6, 6.1 and 5.15 patches.

Thanks for your suggestion, I will send a V2 later.

https://lore.kernel.org/all/[email protected]/

Signature · 1 line
Lee Jones