Commit 534cf52a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sd: delay calling free_opal_dev 



Call free_opal_dev from scsi_disk_release as the opal_dev field is accessed
from the ioctl handler, which isn't synchronized vs sd_release and thus
can be accessed during or after sd_release was called.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20220308055200.735835-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c76c46fa

drivers/scsi/sd.c

+1 −2
Original line number Diff line number Diff line
@@ -3632,8 +3632,6 @@ static int sd_remove(struct device *dev) 
	del_gendisk(sdkp->disk);

	sd_shutdown(dev);



	free_opal_dev(sdkp->opal_dev);



	mutex_lock(&sd_ref_mutex);

	dev_set_drvdata(dev, NULL);

	put_device(&sdkp->disk_dev);
@@ -3675,6 +3673,7 @@ static void scsi_disk_release(struct device *dev) 


	sd_zbc_release_disk(sdkp);

	put_device(&sdkp->device->sdev_gendev);

	free_opal_dev(sdkp->opal_dev);



	kfree(sdkp);

}