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

Commit a6897f39 authored by Vaibhav Jain's avatar Vaibhav Jain Committed by Michael Ellerman
Browse files

cxl: Release irqs if memory allocation fails 



This minor patch plugs a potential irq leak in case of a memory
allocation failure inside function the afu_allocate_irqs. Presently the
irqs allocated to the context gets leaked if allocation of either
one of context irq_bitmap or irq_names fails.

Signed-off-by: default avatarVaibhav Jain <vaibhav@linux.vnet.ibm.com>
Acked-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f47f966f

drivers/misc/cxl/irq.c

+5 −2
Original line number Diff line number Diff line
@@ -430,6 +430,9 @@ int afu_allocate_irqs(struct cxl_context *ctx, u32 count) 
	int rc, r, i, j = 1;

	struct cxl_irq_name *irq_name;



	/* Initialize the list head to hold irq names */

	INIT_LIST_HEAD(&ctx->irq_names);



	if ((rc = cxl_alloc_irq_ranges(&ctx->irqs, ctx->afu->adapter, count)))

		return rc;
@@ -441,13 +444,12 @@ int afu_allocate_irqs(struct cxl_context *ctx, u32 count) 
	ctx->irq_bitmap = kcalloc(BITS_TO_LONGS(count),

				  sizeof(*ctx->irq_bitmap), GFP_KERNEL);

	if (!ctx->irq_bitmap)

		return -ENOMEM;

		goto out;



	/*

	 * Allocate names first.  If any fail, bail out before allocating

	 * actual hardware IRQs.

	 */

	INIT_LIST_HEAD(&ctx->irq_names);

	for (r = 1; r < CXL_IRQ_RANGES; r++) {

		for (i = 0; i < ctx->irqs.range[r]; i++) {

			irq_name = kmalloc(sizeof(struct cxl_irq_name),
@@ -469,6 +471,7 @@ int afu_allocate_irqs(struct cxl_context *ctx, u32 count) 
	return 0;



out:

	cxl_release_irq_ranges(&ctx->irqs, ctx->afu->adapter);

	afu_irq_name_free(ctx);

	return -ENOMEM;

}