From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Williams Subject: [libsas PATCH v10 9/9] libsas: sas_rediscover_dev did not look at the SMP exec status. Date: Sat, 10 Mar 2012 20:39:42 -0800 Message-ID: <20120311043942.27797.69771.stgit@dwillia2-linux.jf.intel.com> References: <20120311043722.27797.97791.stgit@dwillia2-linux.jf.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120311043722.27797.97791.stgit@dwillia2-linux.jf.intel.com> Sender: linux-ide-owner@vger.kernel.org To: linux-scsi@vger.kernel.org Cc: linux-ide@vger.kernel.org, Jeff Skirvin List-Id: linux-scsi@vger.kernel.org From: Jeff Skirvin 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 [djbw: todo sanitize smp_execute_task return values (see: residue)] Signed-off-by: Dan Williams --- drivers/scsi/libsas/sas_expander.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index cacf3fe..e9423f3 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1980,6 +1980,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last) u8 sas_addr[8]; int res; + memset(sas_addr, 0, 8); res = sas_get_phy_attached_dev(dev, phy_id, sas_addr, &type); switch (res) { case SMP_RESP_NO_PHY: @@ -1992,9 +1993,13 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last) return res; case SMP_RESP_FUNC_ACC: 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; sas_unregister_devs_sas_addr(dev, phy_id, last); return res;