Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23015b22 authored by Kangjie Lu's avatar Kangjie Lu Committed by Linus Torvalds
Browse files

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: default avatarKangjie Lu <kjlu@umn.edu>
Acked-by: default avatarAlexandre Bounine <alex.bou9@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3713a4e1

drivers/rapidio/rio_cm.c

+8 −0
Original line number Diff line number Diff line
@@ -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;