Commit 035c3ea1 authored by Daniel Micay's avatar Daniel Micay Committed by Greg Kroah-Hartman

staging/rts5208: Fix read overflow in memcpy

commit 88a5b39b 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: default avatarDaniel Micay <danielmicay@gmail.com>
[kees: wrote commit log]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Wayne Porter <wporter82@gmail.com>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 227e5d4b
......@@ -536,7 +536,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment