| Message ID | 20180911192226.3620-3-labbott@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | String fixups in ibmvscsi | expand |
On Tue, Sep 11, 2018 at 12:22 PM, Laura Abbott <labbott@redhat.com> wrote: > > 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> Reviewed-by: Kees Cook <keescook@chromium.org> -Kees > --- > 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 >
> On Sep 11, 2018, at 2:22 PM, Laura Abbott <labbott@redhat.com> wrote: > > 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> > Reviewed-by: Kees Cook <keescook@chromium.org> > --- > v2: Switch to strscpy instead of just strlcpy > --- > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Bryant G. Ly bly@catalogicsoftware.com I sent a PR to update my email from bryantly@linux.vnet.ibm.com a week ago. -Bryant
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;
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(-)