mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 14:30:55 +07:00
scsi: aacraid: error: testing array offset 'bus' after use
Fix possible indexing array of bound for &aac->hba_map[bus][cid], where
bus and cid boundary check happens later.
Fixes: 0d643ff3c3
("scsi: aacraid: use aac_tmf_callback for reset fib")
Signed-off-by: Nikola Pajkovsky <npajkovsky@suse.cz>
Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
5c756065e4
commit
4cb433e856
@ -906,12 +906,14 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd)
|
||||
|
||||
bus = aac_logical_to_phys(scmd_channel(cmd));
|
||||
cid = scmd_id(cmd);
|
||||
info = &aac->hba_map[bus][cid];
|
||||
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS ||
|
||||
info->devtype != AAC_DEVTYPE_NATIVE_RAW)
|
||||
|
||||
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS)
|
||||
return FAILED;
|
||||
|
||||
if (info->reset_state > 0)
|
||||
info = &aac->hba_map[bus][cid];
|
||||
|
||||
if (info->devtype != AAC_DEVTYPE_NATIVE_RAW &&
|
||||
info->reset_state > 0)
|
||||
return FAILED;
|
||||
|
||||
pr_err("%s: Host adapter reset request. SCSI hang ?\n",
|
||||
@ -962,12 +964,14 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd)
|
||||
|
||||
bus = aac_logical_to_phys(scmd_channel(cmd));
|
||||
cid = scmd_id(cmd);
|
||||
info = &aac->hba_map[bus][cid];
|
||||
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS ||
|
||||
info->devtype != AAC_DEVTYPE_NATIVE_RAW)
|
||||
|
||||
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS)
|
||||
return FAILED;
|
||||
|
||||
if (info->reset_state > 0)
|
||||
info = &aac->hba_map[bus][cid];
|
||||
|
||||
if (info->devtype != AAC_DEVTYPE_NATIVE_RAW &&
|
||||
info->reset_state > 0)
|
||||
return FAILED;
|
||||
|
||||
pr_err("%s: Host adapter reset request. SCSI hang ?\n",
|
||||
|
Loading…
Reference in New Issue
Block a user