Skip to contentSkip to conversation

rapidio: fix a NULL pointer derefenrece when create_workqueue fails

PATCH In review Kangjie Lu 2 participants 3 messages Mar 14, 2019 – Mar 18, 2019 Rapidio

lore
Share & tools
lore

Kangjie Lu

author
#0 lore raw

PATCH 1/1 rapidio: fix a NULL pointer derefenrece when create_workqueue fails

In case create_workqueue fails, the fix releases resources and returns -ENOMEM to avoid NULL pointer dereference.

---
 drivers/rapidio/rio_cm.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/rapidio/rio_cm.c +8 -0
index cf45829585cb..b29fc258eeba 100644
@@ -2147,6 +2147,14 @@ static int riocm_add_mport(struct device *dev,
 	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;
Signature · 1 line
2.17.1
maintainer Acked-by on v1 1/1
#1 lore raw

-----Original Message-----
From: Kangjie Lu <[email protected]>
Sent: Thursday, March 14, 2019 2:10 AM
To: [email protected]
Cc: [email protected]; Matt Porter <[email protected]>; Alexandre Bounine <[email protected]>; [email protected]
Subject: [PATCH] rapidio: fix a NULL pointer derefenrece when create_workqueue fails

In case create_workqueue fails, the fix releases resources and returns -ENOMEM to avoid NULL pointer dereference.

---
 drivers/rapidio/rio_cm.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/rapidio/rio_cm.c +8 -0
index cf45829585cb..b29fc258eeba 100644
@@ -2147,6 +2147,14 @@ static int riocm_add_mport(struct device *dev,
 	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;
Signature · 1 line
2.17.1
#2 lore raw
In reply to Kangjie Lu

Please correct spelling in the subject line: "dereference"

-----Original Message-----
From: Kangjie Lu <[email protected]>
Sent: Thursday, March 14, 2019 2:10 AM
To: [email protected]
Cc: [email protected]; Matt Porter <[email protected]>; Alexandre Bounine <[email protected]>; [email protected]
Subject: [PATCH] rapidio: fix a NULL pointer derefenrece when create_workqueue fails

In case create_workqueue fails, the fix releases resources and returns -ENOMEM to avoid NULL pointer dereference.

---
 drivers/rapidio/rio_cm.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/rapidio/rio_cm.c +8 -0
index cf45829585cb..b29fc258eeba 100644
@@ -2147,6 +2147,14 @@ static int riocm_add_mport(struct device *dev,
 	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;
Signature · 1 line
2.17.1