]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: ch341: fix out-of-bounds memory access in ch341_transfer_one
authorTianchu Chen <flynnnchen@tencent.com>
Fri, 28 Nov 2025 08:06:30 +0000 (16:06 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 28 Nov 2025 11:48:08 +0000 (11:48 +0000)
Discovered by Atuin - Automated Vulnerability Discovery Engine.

The 'len' variable is calculated as 'min(32, trans->len + 1)',
which includes the 1-byte command header.

When copying data from 'trans->tx_buf' to 'ch341->tx_buf + 1', using 'len'
as the length is incorrect because:

1. It causes an out-of-bounds read from 'trans->tx_buf' (which has size
   'trans->len', i.e., 'len - 1' in this context).
2. It can cause an out-of-bounds write to 'ch341->tx_buf' if 'len' is
   CH341_PACKET_LENGTH (32). Writing 32 bytes to ch341->tx_buf + 1
   overflows the buffer.

Fix this by copying 'len - 1' bytes.

Fixes: 8846739f52af ("spi: add ch341a usb2spi driver")
Signed-off-by: Tianchu Chen <flynnnchen@tencent.com>
Link: https://patch.msgid.link/20251128160630.0f922c45ec6084a46fb57099@linux.dev
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-ch341.c

index 46bc208f2d0509ba3e3ee9c9f74654e0383b3c01..79d2f9ab4ef037a393d4d9c7e641047cfaf9f67c 100644 (file)
@@ -78,7 +78,7 @@ static int ch341_transfer_one(struct spi_controller *host,
 
        ch341->tx_buf[0] = CH341A_CMD_SPI_STREAM;
 
-       memcpy(ch341->tx_buf + 1, trans->tx_buf, len);
+       memcpy(ch341->tx_buf + 1, trans->tx_buf, len - 1);
 
        ret = usb_bulk_msg(ch341->udev, ch341->write_pipe, ch341->tx_buf, len,
                           NULL, CH341_DEFAULT_TIMEOUT);