[PATCH 5/6] staging/rts5208: Fix read overflow in memcpy

From	Kees Cook <keescook@chromium.org>
Newsgroups	linux.kernel
Subject	[PATCH 5/6] staging/rts5208: Fix read overflow in memcpy
Date	2017-06-06 07:00 +0200
Message-ID	<tPeKZ-460-17@gated-at.bofh.it> (permalink)
References	<tPeKZ-460-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Daniel Micay <danielmicay@gmail.com>

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>
---
 drivers/staging/rts5208/rtsx_scsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rts5208/rtsx_scsi.c b/drivers/staging/rts5208/rtsx_scsi.c
index a95c5de1aa00..36b5a11f21d2 100644
--- a/drivers/staging/rts5208/rtsx_scsi.c
+++ b/drivers/staging/rts5208/rtsx_scsi.c
@@ -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;
-- 
2.7.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 5/6] staging/rts5208: Fix read overflow in memcpy Kees Cook <keescook@chromium.org> - 2017-06-06 07:00 +0200

csiph-web