scsi: ips: Convert strnlen() to memcpy() since result should not be NUL terminated

[sfrench/cifs-2.6.git] / drivers / scsi / ips.c

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index ec85ccce9664750b6e5ba5d130a284a19cd5073c..2e6077c502fc71316bbd75b1e8e927fc33f4a59c 100644 (file)
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -2239,7 +2239,7 @@ ips_get_bios_version(ips_ha_t * ha, int intr)
        major = 0;
        minor = 0;
 
-       strncpy(ha->bios_version, "       ?", 8);
+       memcpy(ha->bios_version, "       ?", 8);
 
        if (ha->pcidev->device == IPS_DEVICEID_COPPERHEAD) {
                if (IPS_USE_MEMIO(ha)) {
@@ -3515,11 +3515,11 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
                                        inquiry.Flags[1] =
                                            IPS_SCSI_INQ_WBus16 |
                                            IPS_SCSI_INQ_Sync;
-                                       strncpy(inquiry.VendorId, "IBM     ",
+                                       memcpy(inquiry.VendorId, "IBM     ",
                                                8);
-                                       strncpy(inquiry.ProductId,
+                                       memcpy(inquiry.ProductId,
                                                "SERVERAID       ", 16);
-                                       strncpy(inquiry.ProductRevisionLevel,
+                                       memcpy(inquiry.ProductRevisionLevel,
                                                "1.00", 4);
 
                                        ips_scmd_buf_write(scb->scsi_cmd,
@@ -4036,9 +4036,9 @@ ips_inquiry(ips_ha_t * ha, ips_scb_t * scb)
        inquiry.Flags[0] = IPS_SCSI_INQ_Address16;
        inquiry.Flags[1] =
            IPS_SCSI_INQ_WBus16 | IPS_SCSI_INQ_Sync | IPS_SCSI_INQ_CmdQue;
-       strncpy(inquiry.VendorId, "IBM     ", 8);
-       strncpy(inquiry.ProductId, "SERVERAID       ", 16);
-       strncpy(inquiry.ProductRevisionLevel, "1.00", 4);
+       memcpy(inquiry.VendorId, "IBM     ", 8);
+       memcpy(inquiry.ProductId, "SERVERAID       ", 16);
+       memcpy(inquiry.ProductRevisionLevel, "1.00", 4);
 
        ips_scmd_buf_write(scb->scsi_cmd, &inquiry, sizeof (inquiry));
 
@@ -5620,10 +5620,10 @@ ips_write_driver_status(ips_ha_t * ha, int intr)
        /* change values (as needed) */
        ha->nvram->operating_system = IPS_OS_LINUX;
        ha->nvram->adapter_type = ha->ad_type;
-       strncpy((char *) ha->nvram->driver_high, IPS_VERSION_HIGH, 4);
-       strncpy((char *) ha->nvram->driver_low, IPS_VERSION_LOW, 4);
-       strncpy((char *) ha->nvram->bios_high, ha->bios_version, 4);
-       strncpy((char *) ha->nvram->bios_low, ha->bios_version + 4, 4);
+       memcpy((char *) ha->nvram->driver_high, IPS_VERSION_HIGH, 4);
+       memcpy((char *) ha->nvram->driver_low, IPS_VERSION_LOW, 4);
+       memcpy((char *) ha->nvram->bios_high, ha->bios_version, 4);
+       memcpy((char *) ha->nvram->bios_low, ha->bios_version + 4, 4);
 
        ha->nvram->versioning = 0;      /* Indicate the Driver Does Not Support Versioning */