Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb9d5418 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

scsi: libsas: Use _safe() loop in sas_resume_port() 

[ Upstream commit 8c7e7b8486cda21269d393245883c5e4737d5ee7 ]

If sas_notify_lldd_dev_found() fails then this code calls:

	sas_unregister_dev(port, dev);

which removes "dev", our list iterator, from the list.  This could lead to
an endless loop.  We need to use list_for_each_entry_safe().

Link: https://lore.kernel.org/r/YKUeq6gwfGcvvhty@mwanda


Fixes: 303694ee ("[SCSI] libsas: suspend / resume support")
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0d1a9432

drivers/scsi/libsas/sas_port.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ static bool phy_is_wideport_member(struct asd_sas_port *port, struct asd_sas_phy 




static void sas_resume_port(struct asd_sas_phy *phy)

static void sas_resume_port(struct asd_sas_phy *phy)

{

{

	struct domain_device *dev;

	struct domain_device *dev, *n;

	struct asd_sas_port *port = phy->port;

	struct asd_sas_port *port = phy->port;

	struct sas_ha_struct *sas_ha = phy->ha;

	struct sas_ha_struct *sas_ha = phy->ha;

	struct sas_internal *si = to_sas_internal(sas_ha->core.shost->transportt);

	struct sas_internal *si = to_sas_internal(sas_ha->core.shost->transportt);
@@ -60,7 +60,7 @@ static void sas_resume_port(struct asd_sas_phy *phy) 
	 * 1/ presume every device came back

	 * 1/ presume every device came back

	 * 2/ force the next revalidation to check all expander phys

	 * 2/ force the next revalidation to check all expander phys

	 */

	 */

	list_for_each_entry(dev, &port->dev_list, dev_list_node) {

	list_for_each_entry_safe(dev, n, &port->dev_list, dev_list_node) {

		int i, rc;

		int i, rc;





		rc = sas_notify_lldd_dev_found(dev);

		rc = sas_notify_lldd_dev_found(dev);