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

Commit 06064a10 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Roland Dreier
Browse files

IB/qib: Fix memory leak of recv context when driver fails to initialize. 



In qib_create_ctxts() we allocate an array to hold recv contexts. Then attempt
to create data for those recv contexts. If that call to qib_create_ctxtdata()
fails then an error is returned but the previously allocated memory is not
freed.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 8572de97

drivers/infiniband/hw/qib/qib_init.c

+5 −8
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ void qib_set_ctxtcnt(struct qib_devdata *dd) 
int qib_create_ctxts(struct qib_devdata *dd)

{

	unsigned i;

	int ret;

	int local_node_id = pcibus_to_node(dd->pcidev->bus);



	if (local_node_id < 0)
@@ -145,8 +144,7 @@ int qib_create_ctxts(struct qib_devdata *dd) 
	if (!dd->rcd) {

		qib_dev_err(dd,

			"Unable to allocate ctxtdata array, failing\n");

		ret = -ENOMEM;

		goto done;

		return -ENOMEM;

	}



	/* create (one or more) kctxt */
@@ -163,15 +161,14 @@ int qib_create_ctxts(struct qib_devdata *dd) 
		if (!rcd) {

			qib_dev_err(dd,

				"Unable to allocate ctxtdata for Kernel ctxt, failing\n");

			ret = -ENOMEM;

			goto done;

			kfree(dd->rcd);

			dd->rcd = NULL;

			return -ENOMEM;

		}

		rcd->pkeys[0] = QIB_DEFAULT_P_KEY;

		rcd->seq_cnt = 1;

	}

	ret = 0;

done:

	return ret;

	return 0;

}



/*