2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 5c1a86584079..3d980a21f479 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -37,6 +37,7 @@
 #include "qla_nx.h"
 #define QLA2XXX_DRIVER_NAME     "qla2xxx"
 #define QLA2XXX_APIDEV          "ql2xapidev"
+#define QLA2XXX_MANUFACTURER    "QLogic Corporation"
 
 /*
  * We have MAILBOX_REGISTER_COUNT sized arrays in a few places,
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 40c5933743a4..9b455250c101 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1328,8 +1328,8 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
         /* Manufacturer. */
         eiter = (struct ct_fdmi_hba_attr *) (entries + size);
         eiter->type = __constant_cpu_to_be16(FDMI_HBA_MANUFACTURER);
-        strcpy(eiter->a.manufacturer, "QLogic Corporation");
-        alen = strlen(eiter->a.manufacturer);
+        alen = strlen(QLA2XXX_MANUFACTURER);
+        strncpy(eiter->a.manufacturer, QLA2XXX_MANUFACTURER, alen + 1);
         alen += (alen & 3) ? (4 - (alen & 3)) : 4;
         eiter->len = cpu_to_be16(4 + alen);
         size += 4 + alen;
@@ -1649,8 +1649,8 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)
         /* OS device name. */
         eiter = (struct ct_fdmi_port_attr *) (entries + size);
         eiter->type = __constant_cpu_to_be16(FDMI_PORT_OS_DEVICE_NAME);
-        strcpy(eiter->a.os_dev_name, QLA2XXX_DRIVER_NAME);
-        alen = strlen(eiter->a.os_dev_name);
+        alen = strlen(QLA2XXX_DRIVER_NAME);
+        strncpy(eiter->a.os_dev_name, QLA2XXX_DRIVER_NAME, alen + 1);
         alen += (alen & 3) ? (4 - (alen & 3)) : 4;
         eiter->len = cpu_to_be16(4 + alen);
         size += 4 + alen;