From: Nilesh Javali Date: Sat, 29 Dec 2012 07:24:53 +0000 (-0500) Subject: [SCSI] qla4xxx: Correct the validation to check in get_sys_info mailbox X-Git-Tag: upstream/snapshot3+hdmi~5614^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e19dd66f105c54868e722f6b0a4f2edfc83f1ef9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [SCSI] qla4xxx: Correct the validation to check in get_sys_info mailbox Check mbox_sts[3] instead of mbox_sts[4] for ISP83xx to validate size of data returned Signed-off-by: Nilesh Javali Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index 491668d..b3d6dab 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c @@ -3427,11 +3427,11 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha) } /* Make sure we receive the minimum required data to cache internally */ - if (mbox_sts[4] < offsetof(struct mbx_sys_info, reserved)) { + if ((is_qla8032(ha) ? mbox_sts[3] : 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; - } /* Save M.A.C. address & serial_number */