diff options
| author | Christoph Hellwig <[email protected]> | 2022-03-08 06:51:52 +0100 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2022-03-08 19:40:01 -0700 |
| commit | 534cf52aa9c18d87599a8811a39735c1b62742a0 (patch) | |
| tree | 706c06bc4c59d02de3083e200d72055d5ecbbd81 | |
| parent | c76c46fa04c42f7d3a494c526ce5f030da36b553 (diff) | |
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: Christoph Hellwig <[email protected]>
Reviewed-by: Bart Van Assche <[email protected]>
Reviewed-by: Chaitanya Kulkarni <[email protected]>
Reviewed-by: Ming Lei <[email protected]>
Reviewed-by: Martin K. Petersen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | drivers/scsi/sd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7bfebf5b2832..346b8d62de7d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -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); } |