Skip to contentSkip to conversation

scsi: message: fusion: Use more common error handling code in mpt_attach()

PATCH New Markus Elfring 2 participants 2 messages Jun 17

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: message: fusion: Use more common error handling code in mpt_attach()

From: Markus Elfring <[email protected]>
Date: Wed, 17 Jun 2026 20:22:26 +0200

Use an existing label once more so that a bit of exception handling can be better reused at the end of this function implementation.

This issue was detected by using the Coccinelle software.

---
 drivers/message/fusion/mptbase.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/message/fusion/mptbase.c +1 -3
index 3a431ffd3e2e..c2c5a25cf5ae 100644
@@ -2014,9 +2014,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
 		destroy_workqueue(ioc->reset_work_q);
 		ioc->reset_work_q = NULL;
-
-		kfree(ioc);
-		return r;
+		goto out_free_ioc;
 	}
 
 	/* call per device driver probe entry point */
Signature · 1 line
2.54.0
#1 lore raw
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:

Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:

Pre-existing issues:
- [High] Data race on global ioc_list and static mpt_ids variables during concurrent device probing.
- [High] DMA memory leak on device initialization failure.
--

commit 4e8cbd0babcc92bd561c86ab647d8b47fc357dc0
Author: Markus Elfring <[email protected]>

scsi: message: fusion: Use more common error handling code in mpt_attach()

Use an existing label once more so that a bit of exception handling can be better reused at the end of this function implementation.

drivers/message/fusion/mptbase.c mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) · line 2017

Quoted 12 lines
drivers/message/fusion/mptbase.c +1 -3
index 3a431ffd3e2eb..c2c5a25cf5aec 100644
@@ -2014,9 +2014,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
 		destroy_workqueue(ioc->reset_work_q);
 		ioc->reset_work_q = NULL;
-
-		kfree(ioc);
-		return r;
+		goto out_free_ioc;

[Severity: High]
This isn't a bug introduced by this patch, but does this error path permanently leak DMA memory?

If mpt_do_ioc_recovery() fails, it bails out to this error path that cleans up some resources before jumping to out_free_ioc to free the ioc struct.

However, mpt_do_ioc_recovery() internally calls PrimeIocFifos(), which allocates large DMA coherent buffers (saved in ioc->alloc and ioc->sense_buf_pool). Because mpt_adapter_disable(ioc) or mpt_adapter_dispose(ioc) is never called on this error path, these DMA allocations appear to be leaked.

[Severity: High]
This is a pre-existing issue, but is there a data race when modifying global variables during concurrent device probing?

The mpt_attach() function is called during PCI device probing. The Linux driver core does not serialize probe routines across different devices; it only holds a per-device lock. If multiple MPT controllers are bound concurrently (e.g., via concurrent sysfs bind writes), multiple threads could modify the static mpt_ids counter and append to the global ioc_list simultaneously without synchronization:

mpt_attach() {
    ...
    ioc->id = mpt_ids++;
    ...
    list_add_tail(&ioc->list, &ioc_list);
    ...
}

Could this lead to list corruption and kernel crashes?

Quoted 3 lines
drivers/message/fusion/mptbase.c +0 -0
 	}
 
 	/* call per device driver probe entry point */
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1