From: Kees Cook <keescook@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>,
Daniel Micay <danielmicay@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Wayne Porter <wporter82@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] staging/rts5208: Fix read overflow in memcpy
Date: Mon, 5 Jun 2017 21:52:34 -0700 [thread overview]
Message-ID: <1496724755-104187-6-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1496724755-104187-1-git-send-email-keescook@chromium.org>
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
next prev parent reply other threads:[~2017-06-06 4:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 4:52 [PATCH] FORTIFY_SOURCE build fixes Kees Cook
2017-06-06 4:52 ` [PATCH 1/6] arm64, vdso: Define vdso_{start,end} as array Kees Cook
2017-06-06 9:43 ` Catalin Marinas
2017-06-06 9:49 ` Will Deacon
2017-06-06 16:11 ` Kees Cook
2017-06-06 4:52 ` [PATCH 2/6] efi: Avoid fortify checks in EFI stub Kees Cook
2017-06-06 17:13 ` Ard Biesheuvel
2017-06-06 17:17 ` Mark Rutland
2017-06-07 3:12 ` Kees Cook
2017-06-07 8:54 ` Ard Biesheuvel
2017-06-08 2:37 ` Kees Cook
2017-06-09 9:01 ` Ard Biesheuvel
2017-06-16 9:14 ` Ard Biesheuvel
2017-06-07 9:27 ` Mark Rutland
2017-06-06 4:52 ` [PATCH 3/6] x86/power/64: Use char arrays for asm function names Kees Cook
2017-06-06 4:52 ` [PATCH 4/6] kexec_file: Adjust declaration of kexec_purgatory Kees Cook
2017-06-06 4:52 ` Kees Cook [this message]
2017-06-06 4:52 ` [PATCH 6/6] IB/rxe: Do not copy extra stack memory to skb Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496724755-104187-6-git-send-email-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=danielmicay@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wporter82@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®