From: Kees Cook <kees@kernel.org>
To: Jack Wang <jinpu.wang@cloud.ionos.com>
Cc: Kees Cook <kees@kernel.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: [PATCH v2] scsi: pm80xx: Use C String API for string comparisons
Date: Wed, 12 Mar 2025 13:05:36 -0700 [thread overview]
Message-ID: <20250312200532.it.808-kees@kernel.org> (raw)
When a character array without a terminating NUL character has a static
initializer, GCC 15's -Wunterminated-string-initialization will only
warn if the array lacks the "nonstring" attribute[1]. There is no reason
for the command lookup logic to not use strcmp(), so grow the string
length and update the check to eliminate the warning:
../drivers/scsi/pm8001/pm8001_ctl.c:652:7: warning: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (9 chars into 8 available) [-Wunterminated-string-initialization]
652 | {"set_nvmd", FLASH_CMD_SET_NVMD},
| ^~~~~~~~~~
Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1]
Signed-off-by: Kees Cook <kees@kernel.org>
---
In taking another look at this, I realize that actually strcmp() should be used,
so just grow the size of this character array and use strcmp().
v1: https://lore.kernel.org/lkml/20250310222553.work.437-kees@kernel.org/
v2: Use strcmp()
---
Cc: Jack Wang <jinpu.wang@cloud.ionos.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
---
drivers/scsi/pm8001/pm8001_ctl.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c
index 85ff95c6543a..bb8fd5f0f441 100644
--- a/drivers/scsi/pm8001/pm8001_ctl.c
+++ b/drivers/scsi/pm8001/pm8001_ctl.c
@@ -644,7 +644,7 @@ static DEVICE_ATTR(gsm_log, S_IRUGO, pm8001_ctl_gsm_log_show, NULL);
#define FLASH_CMD_SET_NVMD 0x02
struct flash_command {
- u8 command[8];
+ u8 command[9];
int code;
};
@@ -825,8 +825,7 @@ static ssize_t pm8001_store_update_fw(struct device *cdev,
}
for (i = 0; flash_command_table[i].code != FLASH_CMD_NONE; i++) {
- if (!memcmp(flash_command_table[i].command,
- cmd_ptr, strlen(cmd_ptr))) {
+ if (!strcmp(flash_command_table[i].command, cmd_ptr)) {
flash_command = flash_command_table[i].code;
break;
}
--
2.34.1
next reply other threads:[~2025-03-12 20:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 20:05 Kees Cook [this message]
2025-03-14 13:06 ` [PATCH v2] scsi: pm80xx: Use C String API for string comparisons David Laight
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=20250312200532.it.808-kees@kernel.org \
--to=kees@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=jinpu.wang@cloud.ionos.com \
--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.