The patch titled
Subject: rapidio: fix a NULL pointer dereference when create_workqueue() fails
has been added to the -mm tree. Its filename is
rapidio-fix-a-null-pointer-derefenrece-when-create_workqueue-fails.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rapidio-fix-a-null-pointer-derefenrece-when-create_workqueue-fails.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rapidio-fix-a-null-pointer-derefenrece-when-create_workqueue-fails.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Kangjie Lu <kjlu@xxxxxxx>
Subject: rapidio: fix a NULL pointer dereference when create_workqueue() fails
In case create_workqueue fails, the fix releases resources and
returns -ENOMEM to avoid NULL pointer dereference.
Signed-off-by: Kangjie Lu <kjlu@xxxxxxx>
Acked-by: Alexandre Bounine <alex.bou9@xxxxxxxxx>
Cc: Matt Porter <mporter@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rapidio/rio_cm.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/drivers/rapidio/rio_cm.c~rapidio-fix-a-null-pointer-derefenrece-when-create_workqueue-fails
+++ a/drivers/rapidio/rio_cm.c
@@ -2147,6 +2147,14 @@ static int riocm_add_mport(struct device
mutex_init(&cm->rx_lock);
riocm_rx_fill(cm, RIOCM_RX_RING_SIZE);
cm->rx_wq = create_workqueue(DRV_NAME "/rxq");
+ if (!cm->rx_wq) {
+ riocm_error("failed to allocate IBMBOX_%d on %s",
+ cmbox, mport->name);
+ rio_release_outb_mbox(mport, cmbox);
+ kfree(cm);
+ return -ENOMEM;
+ }
+
INIT_WORK(&cm->rx_work, rio_ibmsg_handler);
cm->tx_slot = 0;
_
Patches currently in -mm which might be from kjlu@xxxxxxx are
rapidio-fix-a-null-pointer-derefenrece-when-create_workqueue-fails.patch
