Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d792d4c4 authored by Laura Abbott's avatar Laura Abbott Committed by Martin K. Petersen
Browse files

scsi: ibmvscsis: Fix a stringop-overflow warning 



There's currently a warning about string overflow with strncat:

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_probe':
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:3479:2: error: 'strncat' specified
bound 64 equals destination size [-Werror=stringop-overflow=]
  strncat(vscsi->eye, vdev->name, MAX_EYE);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Switch to a single snprintf instead of a strcpy + strcat to handle this
cleanly.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Suggested-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cbe3fd39

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+1 −2
Original line number Diff line number Diff line
@@ -3474,8 +3474,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev, 
		vscsi->dds.window[LOCAL].liobn,

		vscsi->dds.window[REMOTE].liobn);



	strcpy(vscsi->eye, "VSCSI ");

	strncat(vscsi->eye, vdev->name, MAX_EYE);

	snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name);



	vscsi->dds.unit_id = vdev->unit_address;

	strncpy(vscsi->dds.partition_name, partition_name,