Skip to content

Commit

Permalink
spi: spidev_test: Fix buffer overflow in unescape()
Browse files Browse the repository at this point in the history
Sometimes spidev_test crashes with:

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

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
string.

Fixes: 3006191 (spi: spidev_test: Added input buffer from the terminal)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org> # v4.5+
  • Loading branch information
Geert Uytterhoeven authored and Mark Brown committed Sep 14, 2016
1 parent 29b4817 commit 0278b34
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/spi/spidev_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,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;

Expand Down

0 comments on commit 0278b34

Please sign in to comment.