2 files changed, 12 insertions, 11 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index c94c9ddfb3a6..0336c6db8cb3 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -673,17 +673,17 @@ struct flash_sys_info {
 };      /* 200 */
 
 struct mbx_sys_info {
-        uint8_t board_id_str[16];       /* Keep board ID string first */
-                                        /* in this structure for GUI. */
-        uint16_t board_id;      /* board ID code */
-        uint16_t phys_port_cnt; /* number of physical network ports */
-        uint16_t port_num;      /* network port for this PCI function */
+        uint8_t board_id_str[16];   /*  0-f  Keep board ID string first */
+                                /* in this structure for GUI. */
+        uint16_t board_id;      /* 10-11 board ID code */
+        uint16_t phys_port_cnt; /* 12-13 number of physical network ports */
+        uint16_t port_num;      /* 14-15 network port for this PCI function */
                                 /* (port 0 is first port) */
-        uint8_t mac_addr[6];    /* MAC address for this PCI function */
-        uint32_t iscsi_pci_func_cnt;    /* number of iSCSI PCI functions */
-        uint32_t pci_func;              /* this PCI function */
-        unsigned char serial_number[16];        /* serial number string */
-        uint8_t reserved[16];
+        uint8_t mac_addr[6];    /* 16-1b MAC address for this PCI function */
+        uint32_t iscsi_pci_func_cnt;  /* 1c-1f number of iSCSI PCI functions */
+        uint32_t pci_func;            /* 20-23 this PCI function */
+        unsigned char serial_number[16];  /* 24-33 serial number string */
+        uint8_t reserved[12];             /* 34-3f */
 };
 
 struct crash_record {
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 3e119ae78397..ec46651100cb 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -2145,7 +2145,8 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha)
                 goto exit_validate_mac82;
         }
 
-        if (mbox_sts[4] < sizeof(*sys_info)) {
+        /* Make sure we receive the minimum required data to cache internally */
+        if (mbox_sts[4] < offsetof(struct mbx_sys_info, reserved)) {
                 DEBUG2(printk("scsi%ld: %s: GET_SYS_INFO data receive"
                     " error (%x)\n", ha->host_no, __func__, mbox_sts[4]));
                 goto exit_validate_mac82;