]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
scsi: ibmvscsi: change strncpy+truncation to strlcpy
authorDominique Martinet <asmadeus@codewreck.org>
Fri, 13 Jul 2018 01:25:56 +0000 (03:25 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 31 Jul 2018 03:17:53 +0000 (23:17 -0400)
Generated by scripts/coccinelle/misc/strncpy_truncation.cocci

Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ibmvscsi/ibmvscsi.c

index 02689298325b95c5543923daa9581d6287a5b00a..9df8a1a2299ccfce4a62efa98b5520de8a7e3f46 100644 (file)
@@ -1274,14 +1274,12 @@ static void send_mad_capabilities(struct ibmvscsi_host_data *hostdata)
        if (hostdata->client_migrated)
                hostdata->caps.flags |= cpu_to_be32(CLIENT_MIGRATED);
 
-       strncpy(hostdata->caps.name, dev_name(&hostdata->host->shost_gendev),
+       strlcpy(hostdata->caps.name, dev_name(&hostdata->host->shost_gendev),
                sizeof(hostdata->caps.name));
-       hostdata->caps.name[sizeof(hostdata->caps.name) - 1] = '\0';
 
        location = of_get_property(of_node, "ibm,loc-code", NULL);
        location = location ? location : dev_name(hostdata->dev);
-       strncpy(hostdata->caps.loc, location, sizeof(hostdata->caps.loc));
-       hostdata->caps.loc[sizeof(hostdata->caps.loc) - 1] = '\0';
+       strlcpy(hostdata->caps.loc, location, sizeof(hostdata->caps.loc));
 
        req->common.type = cpu_to_be32(VIOSRP_CAPABILITIES_TYPE);
        req->buffer = cpu_to_be64(hostdata->caps_addr);