Skip to content

Commit f20fbaa

Browse files
ian-abbottbroonie
authored andcommitted
spi: spidev: fix possible arithmetic overflow for multi-transfer message
`spidev_message()` sums the lengths of the individual SPI transfers to determine the overall SPI message length. It restricts the total length, returning an error if too long, but it does not check for arithmetic overflow. For example, if the SPI message consisted of two transfers and the first has a length of 10 and the second has a length of (__u32)(-1), the total length would be seen as 9, even though the second transfer is actually very long. If the second transfer specifies a null `rx_buf` and a non-null `tx_buf`, the `copy_from_user()` could overrun the spidev's pre-allocated tx buffer before it reaches an invalid user memory address. Fix it by checking that neither the total nor the individual transfer lengths exceed the maximum allowed value. Thanks to Dan Carpenter for reporting the potential integer overflow. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 9a12bff commit f20fbaa

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/spi/spidev.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,10 @@ static int spidev_message(struct spidev_data *spidev,
249249
total += k_tmp->len;
250250
/* Since the function returns the total length of transfers
251251
* on success, restrict the total to positive int values to
252-
* avoid the return value looking like an error.
252+
* avoid the return value looking like an error. Also check
253+
* each transfer length to avoid arithmetic overflow.
253254
*/
254-
if (total > INT_MAX) {
255+
if (total > INT_MAX || k_tmp->len > INT_MAX) {
255256
status = -EMSGSIZE;
256257
goto done;
257258
}

0 commit comments

Comments
 (0)