From: david.laight.linux@gmail.com
To: Kees Cook <kees@kernel.org>,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-scsi@vger.kernel.org
Cc: Arnd Bergmann <arnd@kernel.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Khalid Aziz <khalid@gonehiking.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
David Laight <david.laight.linux@gmail.com>
Subject: [PATCH next] drivers/scsi/BusLogic: Avoid overrunning static message buffer
Date: Mon, 8 Jun 2026 10:55:18 +0100 [thread overview]
Message-ID: <20260608095523.2606-34-david.laight.linux@gmail.com> (raw)
From: David Laight <david.laight.linux@gmail.com>
blogic_msg() seems to save output in a static buffer (presumably for
diagnostic reasons).
Discard copies that would overrun the buffer end.
Since the length is calculated used memcpy() not strcpy() for the copy.
Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
This is one of a group of patches that remove potentially unbounded
strcpy() calls.
They are mostly replaced by strscpy() or, when strlen() has just been
called, with memcpy() (usually including the '\0').
Calls with copy string literals into arrays are left unchanged.
They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and
then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain strcpy().
As well as 'difficult to fix' files, this included 'show' functions
as they really need to use sysfs_emit() or seq_printf().
All the patches are being sent individually to avoid very long cc lists.
Apologies for the terse commit messages and likely unexpected tags.
(There are about 100 patches in total.)
drivers/scsi/BusLogic.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 5304d2febd63..7e481dbfc521 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -3451,13 +3451,17 @@ static void blogic_msg(enum blogic_msglevel msglevel, char *fmt,
va_end(args);
if (msglevel == BLOGIC_ANNOUNCE_LEVEL) {
static int msglines = 0;
- strcpy(&adapter->msgbuf[adapter->msgbuflen], buf);
- adapter->msgbuflen += len;
+ if (adapter->msgbuflen + len < sizeof (adapter->msgbuf)) {
+ memcpy(&adapter->msgbuf[adapter->msgbuflen], buf, len + 1);
+ adapter->msgbuflen += len;
+ }
if (++msglines <= 2)
printk("%sscsi: %s", blogic_msglevelmap[msglevel], buf);
} else if (msglevel == BLOGIC_INFO_LEVEL) {
- strcpy(&adapter->msgbuf[adapter->msgbuflen], buf);
- adapter->msgbuflen += len;
+ if (adapter->msgbuflen + len < sizeof (adapter->msgbuf)) {
+ memcpy(&adapter->msgbuf[adapter->msgbuflen], buf, len + 1);
+ adapter->msgbuflen += len;
+ }
if (begin) {
if (buf[0] != '\n' || len > 1)
printk("%sscsi%d: %s", blogic_msglevelmap[msglevel], adapter->host_no, buf);
--
2.39.5
reply other threads:[~2026-06-08 9:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260608095523.2606-34-david.laight.linux@gmail.com \
--to=david.laight.linux@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arnd@kernel.org \
--cc=kees@kernel.org \
--cc=khalid@gonehiking.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.