elx: efct: fix vport list linkage in lio backend

Message ID 20210619155729.20049-1-jsmart2021@gmail.com
State New
Headers show
Series
  • elx: efct: fix vport list linkage in lio backend
Related show

Commit Message

James Smart June 19, 2021, 3:57 p.m.
vport is linked onto the drivers vport list at allocation, but
failure path fails to removed from the list.

Change location of linkage until after complete vport completion.

Fixes: 692e5d73a811 ("scsi: elx: efct: LIO backend interface routines")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Co-developed-by: Ram Vegesna <ram.vegesna@broadcom.com>
Signed-off-by: Ram Vegesna <ram.vegesna@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
---
 drivers/scsi/elx/efct/efct_lio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Martin K. Petersen June 23, 2021, 1:13 a.m. | #1
James,

> vport is linked onto the drivers vport list at allocation, but

> failure path fails to removed from the list.


Applied to 5.14/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering
Martin K. Petersen June 29, 2021, 4:10 a.m. | #2
On Sat, 19 Jun 2021 08:57:29 -0700, James Smart wrote:

> vport is linked onto the drivers vport list at allocation, but

> failure path fails to removed from the list.

> 

> Change location of linkage until after complete vport completion.


Applied to 5.14/scsi-queue, thanks!

[1/1] elx: efct: fix vport list linkage in lio backend
      https://git.kernel.org/mkp/scsi/c/f7c95d7460e3

-- 
Martin K. Petersen	Oracle Linux Engineering

Patch

diff --git a/drivers/scsi/elx/efct/efct_lio.c b/drivers/scsi/elx/efct/efct_lio.c
index e1bab2b17e4d..6ad5168a86ca 100644
--- a/drivers/scsi/elx/efct/efct_lio.c
+++ b/drivers/scsi/elx/efct/efct_lio.c
@@ -832,10 +832,6 @@  efct_lio_npiv_make_nport(struct target_fabric_configfs *tf,
 	}
 
 	vport_list->lio_vport = lio_vport;
-	spin_lock_irqsave(&efct->tgt_efct.efct_lio_lock, flags);
-	INIT_LIST_HEAD(&vport_list->list_entry);
-	list_add_tail(&vport_list->list_entry, &efct->tgt_efct.vport_list);
-	spin_unlock_irqrestore(&efct->tgt_efct.efct_lio_lock, flags);
 
 	memset(&vport_id, 0, sizeof(vport_id));
 	vport_id.port_name = npiv_wwpn;
@@ -853,6 +849,10 @@  efct_lio_npiv_make_nport(struct target_fabric_configfs *tf,
 	}
 
 	lio_vport->fc_vport = new_fc_vport;
+	spin_lock_irqsave(&efct->tgt_efct.efct_lio_lock, flags);
+	INIT_LIST_HEAD(&vport_list->list_entry);
+	list_add_tail(&vport_list->list_entry, &efct->tgt_efct.vport_list);
+	spin_unlock_irqrestore(&efct->tgt_efct.efct_lio_lock, flags);
 
 	return &lio_vport->vport_wwn;
 }