]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
scsi: sr: Fix sr_probe() missing mutex_destroy
authorSimon Arlott <simon@octiron.net>
Sat, 30 May 2020 17:58:25 +0000 (18:58 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:48:31 +0000 (17:48 +0200)
[ Upstream commit a247e07f8dadba5da9f188aaf4f96db0302146d9 ]

If the device minor cannot be allocated or the cdrom fails to be registered
then the mutex should be destroyed.

Link: https://lore.kernel.org/r/06e9de38-eeed-1cab-5e08-e889288935b3@0882a8b5-c6c3-11e9-b005-00805fc181fe
Fixes: 51a858817dcd ("scsi: sr: get rid of sr global mutex")
Signed-off-by: Simon Arlott <simon@octiron.net>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/sr.c

index d2fe3fa470f95fb1d0a872d0c0763b4c075a9b9f..8d062d4f3ce0b548cc9c7c957be4d4d33d5f0f72 100644 (file)
@@ -817,6 +817,7 @@ static int sr_probe(struct device *dev)
 
 fail_put:
        put_disk(disk);
+       mutex_destroy(&cd->lock);
 fail_free:
        kfree(cd);
 fail: