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

Commit 7fbd7648 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock 



If ioc->pci_error_recovery is set, goto out in mpt2sas_base_hard_reset_handler()
leads to unlock unheld ioc->reset_in_progress_mutex.

The patch fixes the issue by jumping afer mutex_unlock() call.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: default avatar"Nandigama, Nagalakshmi" <Nagalakshmi.Nandigama@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 3ec1e88b

drivers/scsi/mpt2sas/mpt2sas_base.c

+2 −1
Original line number Diff line number Diff line
@@ -4548,7 +4548,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag, 
		printk(MPT2SAS_ERR_FMT "%s: pci error recovery reset\n",

		    ioc->name, __func__);

		r = 0;

		goto out;

		goto out_unlocked;

	}



	if (mpt2sas_fwfault_debug)
@@ -4604,6 +4604,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag, 
	spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);

	mutex_unlock(&ioc->reset_in_progress_mutex);



 out_unlocked:

	dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: exit\n", ioc->name,

	    __func__));

	return r;