Skip to content

Commit 4827bd6

Browse files
ArnaudLcmgregkh
authored andcommitted
hid: fix I2C read buffer overflow in raw_event() for mcp2221
commit b56cc41 upstream. As reported by syzbot, mcp2221_raw_event lacked validation of incoming I2C read data sizes, risking buffer overflows in mcp->rxbuf during multi-part transfers. As highlighted in the DS20005565B spec, p44, we have: "The number of read-back data bytes to follow in this packet: from 0 to a maximum of 60 bytes of read-back bytes." This patch enforces we don't exceed this limit. Reported-by: syzbot+52c1a7d3e5b361ccd346@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=52c1a7d3e5b361ccd346 Tested-by: syzbot+52c1a7d3e5b361ccd346@syzkaller.appspotmail.com Signed-off-by: Arnaud Lecomte <contact@arnaud-lcm.com> Link: https://patch.msgid.link/20250726220931.7126-1-contact@arnaud-lcm.com Signed-off-by: Benjamin Tissoires <bentiss@kernel.org> Signed-off-by: Romain Sioen <romain.sioen@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 647d6b8 commit 4827bd6

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/hid/hid-mcp2221.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,10 @@ static int mcp2221_raw_event(struct hid_device *hdev,
814814
}
815815
if (data[2] == MCP2221_I2C_READ_COMPL ||
816816
data[2] == MCP2221_I2C_READ_PARTIAL) {
817+
if (!mcp->rxbuf || mcp->rxbuf_idx < 0 || data[3] > 60) {
818+
mcp->status = -EINVAL;
819+
break;
820+
}
817821
buf = mcp->rxbuf;
818822
memcpy(&buf[mcp->rxbuf_idx], &data[4], data[3]);
819823
mcp->rxbuf_idx = mcp->rxbuf_idx + data[3];

0 commit comments

Comments
 (0)