[PATCH v2] spi: spidev_test: Fix buffer overflow in unescape()

From: Geert Uytterhoeven
Date: Fri Sep 09 2016 - 03:02:59 EST

Sometimes spidev_test crashes with:

*** Error in `spidev_test': munmap_chunk(): invalid pointer: 0x00022020 ***

or just

Segmentation fault

This is due to transfer_escaped_string() miscalculating the required
size of the buffer by one byte, causing a buffer overflow in unescape().

Drop the bogus "+ 1" in the strlen() parameter to fix this.

Note that unescape() never copies the zero-terminator of the source
string, so it writes at most as many bytes as the length of the source

Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Fixes: 30061915be6e3a2c ("spi: spidev_test: Added input buffer from the terminal")
Cc: <stable@xxxxxxxxxxxxxxx> # v4.5+
- As unescape() doesn't copy the zero-terminator, it's an off-by-one
not off-by-two bug, and the "+ 1" should just be dropped.

The bug is present in all kernel sources since v4.1, but in v4.5 the
code was changed, and the source file was moved.

The fix for older kernels is straight-forward, there's only a single
strlen() call in Documentation/spi/spidev_test.c:

- size = strlen(input_tx+1);
+ size = strlen(input_tx);

If you want, I can send a patch against v4.4 (for v4.1..v4.4) later.
tools/spi/spidev_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/spi/spidev_test.c b/tools/spi/spidev_test.c
index 1eaa4de6605bd935..f046b77cfefe3056 100644
--- a/tools/spi/spidev_test.c
+++ b/tools/spi/spidev_test.c
@@ -285,7 +285,7 @@ static void parse_opts(int argc, char *argv[])

static void transfer_escaped_string(int fd, char *str)
- size_t size = strlen(str + 1);
+ size_t size = strlen(str);
uint8_t *tx;
uint8_t *rx;