[PATCH v2] fusion-mptbase: handle failed allocation for workqueue

From: Insu Yun
Date: Wed Feb 17 2016 - 23:41:21 EST


the failure of ioc->reset_work_q is checked,
but not ioc->fw_event_q.

Signed-off-by: Insu Yun <wuninsu@xxxxxxxxx>
---
drivers/message/fusion/mptbase.c | 44 ++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 5dcc031..53a5015 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1871,9 +1871,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
if (!ioc->reset_work_q) {
printk(MYIOC_s_ERR_FMT "Insufficient memory to add adapter!\n",
ioc->name);
- pci_release_selected_regions(pdev, ioc->bars);
- kfree(ioc);
- return -ENOMEM;
+ r = -ENOMEM;
+ goto err3;
}

dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "facts @ %p, pfacts[0] @ %p\n",
@@ -1996,24 +1995,16 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
snprintf(ioc->fw_event_q_name, MPT_KOBJ_NAME_LEN, "mpt/%d", ioc->id);
ioc->fw_event_q = create_singlethread_workqueue(ioc->fw_event_q_name);

+ if (!ioc->fw_event_q) {
+ r = -ENOMEM;
+ goto err2;
+ }
+
if ((r = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP,
CAN_SLEEP)) != 0){
printk(MYIOC_s_ERR_FMT "didn't initialize properly! (%d)\n",
ioc->name, r);
-
- list_del(&ioc->list);
- if (ioc->alt_ioc)
- ioc->alt_ioc->alt_ioc = NULL;
- iounmap(ioc->memmap);
- if (r != -5)
- pci_release_selected_regions(pdev, ioc->bars);
-
- destroy_workqueue(ioc->reset_work_q);
- ioc->reset_work_q = NULL;
-
- kfree(ioc);
- pci_set_drvdata(pdev, NULL);
- return r;
+ goto err1;
}

/* call per device driver probe entry point */
@@ -2040,6 +2031,25 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
msecs_to_jiffies(MPT_POLLING_INTERVAL));

return 0;
+
+err1:
+ destroy_workqueue(ioc->fw_event_q);
+ ioc->fw_event_q = NULL;
+err2::
+ destroy_workqueue(ioc->reset_work_q);
+ ioc->reset_work_q = NULL;
+
+ list_del(&ioc->list);
+ if (ioc->alt_ioc)
+ ioc->alt_ioc->alt_ioc = NULL;
+ iounmap(ioc->memmap);
+ pci_set_drvdata(pdev, NULL);
+err3:
+ if (r != -5)
+ pci_release_selected_regions(pdev, ioc->bars);
+ kfree(ioc);
+ return r;
+
}

/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
--
1.9.1