hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] dpt_i2o: move range check forward 

The check to test that "bus_no" was valid came after we had already used
it as an array offset.  This patch moves it forward.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Dan Carpenter 2010-07-15 10:20:19 +02:00 committed by James Bottomley
parent 32de596074
commit e84d96dbb0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/dpt_i2o.c
View File

@ -2640,6 +2640,13 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
continue; continue;
} }
bus_no = buf[0]>>16; bus_no = buf[0]>>16;
if (bus_no >= MAX_CHANNEL) { /* Something wrong skip it */
printk(KERN_WARNING
"%s: Channel number %d out of range\n",
pHba->name, bus_no);
continue;
}
scsi_id = buf[1]; scsi_id = buf[1];
scsi_lun = (buf[2]>>8 )&0xff; scsi_lun = (buf[2]>>8 )&0xff;
pDev = pHba->channel[bus_no].device[scsi_id]; pDev = pHba->channel[bus_no].device[scsi_id];
@ -2668,10 +2675,6 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
adpt_i2o_report_hba_unit(pHba, d); adpt_i2o_report_hba_unit(pHba, d);
adpt_i2o_install_device(pHba, d); adpt_i2o_install_device(pHba, d);
if(bus_no >= MAX_CHANNEL) { // Something wrong skip it
printk(KERN_WARNING"%s: Channel number %d out of range \n", pHba->name, bus_no);
continue;
}
pDev = pHba->channel[bus_no].device[scsi_id]; pDev = pHba->channel[bus_no].device[scsi_id];
if( pDev == NULL){ if( pDev == NULL){
pDev = pDev =