summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2018-09-11 12:22:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-20 09:47:06 +0200
commitee43eeb4d1b96b40bcfaddb0e522367e96ff5ce6 (patch)
treedc7ff6e6a9f00451ff0986be7778507aeda4e733 /drivers
parent10ad9dcade4b5e7d7e49fab5a4aab21d47620e70 (diff)
downloadlinux-stable-ee43eeb4d1b96b40bcfaddb0e522367e96ff5ce6.tar.gz
linux-stable-ee43eeb4d1b96b40bcfaddb0e522367e96ff5ce6.tar.bz2
linux-stable-ee43eeb4d1b96b40bcfaddb0e522367e96ff5ce6.zip
scsi: ibmvscsis: Ensure partition name is properly NUL terminated
[ Upstream commit adad633af7b970bfa5dd1b624a4afc83cac9b235 ] 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> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index 95bf381413e8..ada1ebebd325 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -3478,7 +3478,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;