Commit 9eed785b authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: fcoe: move fcoe_interface_remove() out of fcoe_interface_cleanup() 



This closes a possible race condition in _fcoe_create() where we drop
the rtnl_lock() before calling fcoe_interface_remove().

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarLee Duncan <lduncan@suse.com>
Acked-by: default avatarJohannes Thumshirn <jth@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2a8ee616

drivers/scsi/fcoe/fcoe.c

+7 −5
Original line number Diff line number Diff line
@@ -501,11 +501,6 @@ static void fcoe_interface_cleanup(struct fcoe_interface *fcoe) 
	struct net_device *netdev = fcoe->netdev;

	struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);



	rtnl_lock();

	if (!fcoe->removed)

		fcoe_interface_remove(fcoe);

	rtnl_unlock();



	/* Release the self-reference taken during fcoe_interface_create() */

	/* tear-down the FCoE controller */

	fcoe_ctlr_destroy(fip);
@@ -2140,6 +2135,11 @@ static void fcoe_destroy_work(struct work_struct *work) 
	cdev = fcoe_ctlr_to_ctlr_dev(ctlr);



	fcoe_if_destroy(port->lport);



	rtnl_lock();

	if (!fcoe->removed)

		fcoe_interface_remove(fcoe);

	rtnl_unlock();

	fcoe_interface_cleanup(fcoe);



	mutex_unlock(&fcoe_config_mutex);
@@ -2254,6 +2254,8 @@ static int _fcoe_create(struct net_device *netdev, enum fip_mode fip_mode, 
		printk(KERN_ERR "fcoe: Failed to create interface (%s)\n",

		       netdev->name);

		rc = -EIO;

		if (!fcoe->removed)

			fcoe_interface_remove(fcoe);

		rtnl_unlock();

		fcoe_interface_cleanup(fcoe);

		mutex_unlock(&fcoe_config_mutex);