Skip to content

Commit eccc02b

Browse files
mchp-memcgowengregkh
authored andcommitted
scsi: smartpqi: Fix device resources accessed after device removal
[ Upstream commit b518e86 ] Correct possible race conditions during device removal. Previously, a scheduled work item to reset a LUN could still execute after the device was removed, leading to use-after-free and other resource access issues. This race condition occurs because the abort handler may schedule a LUN reset concurrently with device removal via sdev_destroy(), leading to use-after-free and improper access to freed resources. - Check in the device reset handler if the device is still present in the controller's SCSI device list before running; if not, the reset is skipped. - Cancel any pending TMF work that has not started in sdev_destroy(). - Ensure device freeing in sdev_destroy() is done while holding the LUN reset mutex to avoid races with ongoing resets. Fixes: 2d80f40 ("scsi: smartpqi: Update deleting a LUN via sysfs") Reviewed-by: Scott Teel <scott.teel@microchip.com> Reviewed-by: Scott Benesh <scott.benesh@microchip.com> Signed-off-by: Mike McGowen <mike.mcgowen@microchip.com> Signed-off-by: Don Brace <don.brace@microchip.com> Link: https://patch.msgid.link/20251106163823.786828-3-don.brace@microchip.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 8616943 commit eccc02b

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

drivers/scsi/smartpqi/smartpqi_init.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6395,10 +6395,22 @@ static int pqi_device_reset(struct pqi_ctrl_info *ctrl_info, struct pqi_scsi_dev
63956395

63966396
static int pqi_device_reset_handler(struct pqi_ctrl_info *ctrl_info, struct pqi_scsi_dev *device, u8 lun, struct scsi_cmnd *scmd, u8 scsi_opcode)
63976397
{
6398+
unsigned long flags;
63986399
int rc;
63996400

64006401
mutex_lock(&ctrl_info->lun_reset_mutex);
64016402

6403+
spin_lock_irqsave(&ctrl_info->scsi_device_list_lock, flags);
6404+
if (pqi_find_scsi_dev(ctrl_info, device->bus, device->target, device->lun) == NULL) {
6405+
dev_warn(&ctrl_info->pci_dev->dev,
6406+
"skipping reset of scsi %d:%d:%d:%u, device has been removed\n",
6407+
ctrl_info->scsi_host->host_no, device->bus, device->target, device->lun);
6408+
spin_unlock_irqrestore(&ctrl_info->scsi_device_list_lock, flags);
6409+
mutex_unlock(&ctrl_info->lun_reset_mutex);
6410+
return 0;
6411+
}
6412+
spin_unlock_irqrestore(&ctrl_info->scsi_device_list_lock, flags);
6413+
64026414
dev_err(&ctrl_info->pci_dev->dev,
64036415
"resetting scsi %d:%d:%d:%u SCSI cmd at %p due to cmd opcode 0x%02x\n",
64046416
ctrl_info->scsi_host->host_no, device->bus, device->target, lun, scmd, scsi_opcode);
@@ -6578,7 +6590,9 @@ static void pqi_slave_destroy(struct scsi_device *sdev)
65786590
{
65796591
struct pqi_ctrl_info *ctrl_info;
65806592
struct pqi_scsi_dev *device;
6593+
struct pqi_tmf_work *tmf_work;
65816594
int mutex_acquired;
6595+
unsigned int lun;
65826596
unsigned long flags;
65836597

65846598
ctrl_info = shost_to_hba(sdev->host);
@@ -6605,8 +6619,13 @@ static void pqi_slave_destroy(struct scsi_device *sdev)
66056619

66066620
mutex_unlock(&ctrl_info->scan_mutex);
66076621

6622+
for (lun = 0, tmf_work = device->tmf_work; lun < PQI_MAX_LUNS_PER_DEVICE; lun++, tmf_work++)
6623+
cancel_work_sync(&tmf_work->work_struct);
6624+
6625+
mutex_lock(&ctrl_info->lun_reset_mutex);
66086626
pqi_dev_info(ctrl_info, "removed", device);
66096627
pqi_free_device(device);
6628+
mutex_unlock(&ctrl_info->lun_reset_mutex);
66106629
}
66116630

66126631
static int pqi_getpciinfo_ioctl(struct pqi_ctrl_info *ctrl_info, void __user *arg)

0 commit comments

Comments
 (0)