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

Commit 0606ffe2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen
Browse files

scsi: gdth: avoid buffer overflow warning 



gcc notices that we would overflow the buffer for the
inquiry of the product name if we have too many adapters:

drivers/scsi/gdth.c: In function 'gdth_next':
drivers/scsi/gdth.c:2357:29: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=]
         sprintf(inq.product,"Host Drive  #%02d",t);
                             ^~~~~~~~~~~~~~~~~~~
drivers/scsi/gdth.c:2357:9: note: 'sprintf' output between 16 and 17 bytes into a destination of size 16
         sprintf(inq.product,"Host Drive  #%02d",t);

This won't happen in practice, so just use snprintf to
truncate the string.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bbfd8e8b

drivers/scsi/gdth.c

+1 −1
Original line number Diff line number Diff line
@@ -2354,7 +2354,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) 
        inq.resp_aenc = 2;

        inq.add_length= 32;

        strcpy(inq.vendor,ha->oem_name);

        sprintf(inq.product,"Host Drive  #%02d",t);

        snprintf(inq.product, sizeof(inq.product), "Host Drive  #%02d",t);

        strcpy(inq.revision,"   ");

        gdth_copy_internal_data(ha, scp, (char*)&inq, sizeof(gdth_inq_data));

        break;