Commit 45845e2f authored Jun 05, 2017 by Daniel Micay Committed by Greg Kroah-Hartman Sep 26, 2018

staging/rts5208: Fix read overflow in memcpy



commit 88a5b39b69ab1828fd4130e2baadd184109cea69 upstream.

Noticed by FORTIFY_SOURCE, this swaps memcpy() for strncpy() to zero-value
fill the end of the buffer instead of over-reading a string from .rodata.

Signed-off-by: Daniel Micay <danielmicay@gmail.com>
[kees: wrote commit log]
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Wayne Porter <wporter82@gmail.com>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

parent 0ee00fd8

drivers/staging/rts5208/rtsx_scsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -539,7 +539,7 @@ static int inquiry(struct scsi_cmnd srb, struct rtsx_chip chip)

		if (sendbytes > 8) {
		memcpy(buf, inquiry_buf, 8);
		memcpy(buf + 8, inquiry_string, sendbytes - 8);
		strncpy(buf + 8, inquiry_string, sendbytes - 8);
		if (pro_formatter_flag) {
		/* Additional Length */
		buf[4] = 0x33;