From: Laura Abbott <labbott@redhat.com>
To: "Bryant G. Ly" <bryantly@linux.vnet.ibm.com>,
Michael Cyr <mikecyr@linux.vnet.ibm.com>,
Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <labbott@redhat.com>,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCHv2 2/2] scsi: ibmvscsis: Ensure partition name is properly NUL terminated
Date: Tue, 11 Sep 2018 12:22:26 -0700 [thread overview]
Message-ID: <20180911192226.3620-3-labbott@redhat.com> (raw)
In-Reply-To: <20180911192226.3620-1-labbott@redhat.com>
While reviewing another part of the code, Kees noticed that the
strncpy of the partition name might not always be NUL terminated. Switch
to using strscpy which does this safely.
Reported-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v2: Switch to strscpy instead of just strlcpy
---
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index b3a029ad07cd..f42a619198c4 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -3477,7 +3477,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev,
snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name);
vscsi->dds.unit_id = vdev->unit_address;
- strncpy(vscsi->dds.partition_name, partition_name,
+ strscpy(vscsi->dds.partition_name, partition_name,
sizeof(vscsi->dds.partition_name));
vscsi->dds.partition_num = partition_number;
--
2.17.1
next prev parent reply other threads:[~2018-09-11 19:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 19:22 [PATCHv3 0/2] String fixups in ibmvscsi Laura Abbott
2018-09-11 19:22 ` [PATCHv3 1/2] scsi: ibmvscsis: Fix a stringop-overflow warning Laura Abbott
2018-09-18 0:37 ` Ly, Bryant
2018-09-11 19:22 ` Laura Abbott [this message]
2018-09-11 19:33 ` [PATCHv2 2/2] scsi: ibmvscsis: Ensure partition name is properly NUL terminated Kees Cook
2018-09-18 0:38 ` Bryant Ly
2018-09-17 6:51 ` [PATCHv3 0/2] String fixups in ibmvscsi Martin K. Petersen
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=20180911192226.3620-3-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=bryantly@linux.vnet.ibm.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mikecyr@linux.vnet.ibm.com \
--cc=target-devel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).