leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] libsas: sas_rediscover_dev did not look at the SMP exec status.

Browse Source 
The discovery function "sas_rediscover_dev" had two bugs: 1) it did
not pay attention to the return status from the SMP task execution;
2) the stack variable used for the returned SAS address was compared
against 0 without being initialized.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Jeff Skirvin 2012-06-21 23:36:10 -07:00 committed by James Bottomley
parent 4e646ddd5f
commit b2311a2875
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/libsas/sas_expander.c
View File

@ -2005,6 +2005,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)
u8 sas_addr[8]; u8 sas_addr[8];
int res; int res;
memset(sas_addr, 0, 8);
res = sas_get_phy_attached_dev(dev, phy_id, sas_addr, &type); res = sas_get_phy_attached_dev(dev, phy_id, sas_addr, &type);
switch (res) { switch (res) {
case SMP_RESP_NO_PHY: case SMP_RESP_NO_PHY:
@ -2017,9 +2018,13 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)
return res; return res;
case SMP_RESP_FUNC_ACC: case SMP_RESP_FUNC_ACC:
break; break;
case -ECOMM:
break;
default:
return res;
} }
if (SAS_ADDR(sas_addr) == 0) { if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) {
phy->phy_state = PHY_EMPTY; phy->phy_state = PHY_EMPTY;
sas_unregister_devs_sas_addr(dev, phy_id, last); sas_unregister_devs_sas_addr(dev, phy_id, last);
return res; return res;