releases/4.9.135/scsi-ibmvscsis-fix-a-stringop-overflow-warning.patch

   1 From foo@baz Thu Oct 18 11:11:32 CEST 2018
   2 From: Laura Abbott <labbott@redhat.com>
   3 Date: Tue, 11 Sep 2018 12:22:25 -0700
   4 Subject: scsi: ibmvscsis: Fix a stringop-overflow warning
   5
   6 From: Laura Abbott <labbott@redhat.com>
   7
   8 [ Upstream commit d792d4c4fc866ae224b0b0ca2aabd87d23b4d6cc ]
   9
  10 There's currently a warning about string overflow with strncat:
  11
  12 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_probe':
  13 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:3479:2: error: 'strncat' specified
  14 bound 64 equals destination size [-Werror=stringop-overflow=]
  15   strncat(vscsi->eye, vdev->name, MAX_EYE);
  16   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  17
  18 Switch to a single snprintf instead of a strcpy + strcat to handle this
  19 cleanly.
  20
  21 Signed-off-by: Laura Abbott <labbott@redhat.com>
  22 Suggested-by: Kees Cook <keescook@chromium.org>
  23 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  24 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26 ---
  27  drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |    3 +--
  28  1 file changed, 1 insertion(+), 2 deletions(-)
  29
  30 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
  31 +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
  32 @@ -3342,8 +3342,7 @@ static int ibmvscsis_probe(struct vio_de
  33                  vscsi->dds.window[LOCAL].liobn,
  34                  vscsi->dds.window[REMOTE].liobn);
  35
  36 -       strcpy(vscsi->eye, "VSCSI ");
  37 -       strncat(vscsi->eye, vdev->name, MAX_EYE);
  38 +       snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name);
  39
  40         vscsi->dds.unit_id = vdev->unit_address;
  41         strncpy(vscsi->dds.partition_name, partition_name,