Skip to content

Commit b518e86

Browse files
mchp-memcgowenmartinkpetersen
authored andcommitted
scsi: smartpqi: Fix device resources accessed after device removal
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>
1 parent f3ecbba commit b518e86

1 file changed

Lines changed: 19 additions & 0 deletions

File tree

drivers/scsi/smartpqi/smartpqi_init.c

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

64286428
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)
64296429
{
6430+
unsigned long flags;
64306431
int rc;
64316432

64326433
mutex_lock(&ctrl_info->lun_reset_mutex);
64336434

6435+
spin_lock_irqsave(&ctrl_info->scsi_device_list_lock, flags);
6436+
if (pqi_find_scsi_dev(ctrl_info, device->bus, device->target, device->lun) == NULL) {
6437+
dev_warn(&ctrl_info->pci_dev->dev,
6438+
"skipping reset of scsi %d:%d:%d:%u, device has been removed\n",
6439+
ctrl_info->scsi_host->host_no, device->bus, device->target, device->lun);
6440+
spin_unlock_irqrestore(&ctrl_info->scsi_device_list_lock, flags);
6441+
mutex_unlock(&ctrl_info->lun_reset_mutex);
6442+
return 0;
6443+
}
6444+
spin_unlock_irqrestore(&ctrl_info->scsi_device_list_lock, flags);
6445+
64346446
dev_err(&ctrl_info->pci_dev->dev,
64356447
"resetting scsi %d:%d:%d:%u SCSI cmd at %p due to cmd opcode 0x%02x\n",
64366448
ctrl_info->scsi_host->host_no, device->bus, device->target, lun, scmd, scsi_opcode);
@@ -6611,7 +6623,9 @@ static void pqi_sdev_destroy(struct scsi_device *sdev)
66116623
{
66126624
struct pqi_ctrl_info *ctrl_info;
66136625
struct pqi_scsi_dev *device;
6626+
struct pqi_tmf_work *tmf_work;
66146627
int mutex_acquired;
6628+
unsigned int lun;
66156629
unsigned long flags;
66166630

66176631
ctrl_info = shost_to_hba(sdev->host);
@@ -6638,8 +6652,13 @@ static void pqi_sdev_destroy(struct scsi_device *sdev)
66386652

66396653
mutex_unlock(&ctrl_info->scan_mutex);
66406654

6655+
for (lun = 0, tmf_work = device->tmf_work; lun < PQI_MAX_LUNS_PER_DEVICE; lun++, tmf_work++)
6656+
cancel_work_sync(&tmf_work->work_struct);
6657+
6658+
mutex_lock(&ctrl_info->lun_reset_mutex);
66416659
pqi_dev_info(ctrl_info, "removed", device);
66426660
pqi_free_device(device);
6661+
mutex_unlock(&ctrl_info->lun_reset_mutex);
66436662
}
66446663

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

0 commit comments

Comments
 (0)