scsi: mpt3sas: Fix use-after-free race in event log access
Subsystems (2)
PATCH 1/1 scsi: mpt3sas: Fix use-after-free race in event log access
A use-after-free race exists between ioctl operations accessing the event log and device removal freeing it. The race occurs because ioc->remove_host flag is set without synchronization, creating a window where an ioctl can pass the removal check but still access freed memory.
Race scenario:
CPU0 (ioctl) CPU1 (device removal)
---------------- ---------------------
_ctl_ioctl_main()
mutex_lock(&pci_access_mutex)
if (!ioc->remove_host)
[check passes]
scsih_remove()
ioc->remove_host = 1
mpt3sas_ctl_release()
kfree(ioc->event_log)
_ctl_eventreport()
copy_to_user(..., ioc->event_log, ...) <- use-after-free mutex_unlock(&pci_access_mutex)
Fix by setting ioc->remove_host while holding pci_access_mutex. This ensures the ioctl path either completes before removal starts, or sees the flag and returns -EAGAIN.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +3 -0
@@ -11264,7 +11264,10 @@ static void scsih_remove(struct pci_dev *pdev)if (_scsih_get_shost_and_ioc (pdev, &shost, &ioc))return ; +/* Set remove_host flag under pci_access_mutex to synchronize with ioctl path */ +mutex_lock (&ioc->pci_access_mutex); ioc->remove_host =1 ; +mutex_unlock (&ioc->pci_access_mutex);if (!pci_device_is_present (pdev)) {mpt3sas_base_pause_mq_polling (ioc);
Signature · 1 line
2.25.1
…
Quoted 3 lines
Fix by setting
ioc->remove_hostwhile holdingpci_access_mutex. This ensures the ioctl path either completes before removal starts, or sees the flag and returns-EAGAIN.
How do you think about to add any tags (like “Fixes” and “Cc”) accordingly?
…
drivers/scsi/mpt3sas/mpt3sas_scsih.c static void scsih_remove(struct pci_dev *pdev) · line 11270
Quoted 9 lines
+++
b/drivers/scsi/mpt3sas/mpt3sas_scsih.cdrivers/scsi/mpt3sas/mpt3sas_scsih.c +3
-0@@ -11264,7 +11264,10 @@ static void scsih_remove(struct pci_dev *pdev)if (_scsih_get_shost_and_ioc (pdev, &shost, &ioc))return ; +/* Set remove_host flag under pci_access_mutex to synchronize with ioctl path */ +mutex_lock (&ioc->pci_access_mutex); ioc->remove_host =1 ; +mutex_unlock (&ioc->pci_access_mutex);
Would it become feasible to apply a scoped_guard() call?
https://elixir.bootlin.com/linux/v6.19-rc5/source/include/linux/mutex.h#L253
drivers/scsi/mpt3sas/mpt3sas_scsih.c static void scsih_remove(struct pci_dev *pdev) · line 11273
Quoted 3 lines
drivers/scsi/mpt3sas/mpt3sas_scsih.c +0
-0if (!pci_device_is_present (pdev)) {mpt3sas_base_pause_mq_polling (ioc);
Regards,
Markus
Quoted 2 lines
Would it become feasible to apply a
scoped_guard()call?
How do you think about to add any tags (like “Fixes” and “Cc”) accordingly?
No problem, addressed the issues in the v2 patch.
Best regards,
Chengfeng
Quoted 4 lines
Quoted 2 lines
Would it become feasible to apply a
scoped_guard()call?
How do you think about to add any tags (like “Fixes” and “Cc”) accordingly?No problem, addressed the issues in the v2 patch.
Thanks for your positive feedback.
https://lore.kernel.org/linux-scsi/[email protected]/
How do you think about to increase the application of scope-based resource management occasionally also any more source code places?
Regards,
Markus
Quoted 2 lines
How do you think about to increase the application of scope-based resource management occasionally also any more source code places?
Thanks for your suggestion on it. I think it is a very good practice to get rid of problems like
lock-leak or double-locking, while keeping the code elegant.
I would certainly like to keep the practice while making my future patch, and help adjust other
code to also use the scope-based locking when appropriate.
Best regards,
Chengfeng