Commit fc6c7cd3 authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Marc Zyngier
Browse files

irqchip/ti-sci-intr: Fix freeing of irqs 



ti_sci_intr_irq_domain_free() assumes that out_irq of intr is stored in
data->chip_data and uses it for calling ti_sci irq_free() and then
mark the out_irq as available resource. But ti_sci_intr_irq_domain_alloc()
is storing p_hwirq(parent's hardware irq) which is translated from out_irq.
This is causing resource leakage and eventually out_irq resources might
be exhausted. Fix ti_sci_intr_irq_domain_alloc() by storing the out_irq
in data->chip_data.

Fixes: a5b659bd ("irqchip/ti-sci-intr: Add support for INTR being a parent to INTR")
Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201102120631.11165-1-lokeshvutla@ti.com
parent b10d5fd4

drivers/irqchip/irq-ti-sci-intr.c

+7 −7
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain, 
 * @virq:	Corresponding Linux virtual IRQ number

 * @hwirq:	Corresponding hwirq for the IRQ within this IRQ domain

 *

 * Returns parent irq if all went well else appropriate error pointer.

 * Returns intr output irq if all went well else appropriate error pointer.

 */

static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,

					unsigned int virq, u32 hwirq)
@@ -173,7 +173,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, 
	if (err)

		goto err_msg;



	return p_hwirq;

	return out_irq;



err_msg:

	irq_domain_free_irqs_parent(domain, virq, 1);
@@ -198,19 +198,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain, 
	struct irq_fwspec *fwspec = data;

	unsigned long hwirq;

	unsigned int flags;

	int err, p_hwirq;

	int err, out_irq;



	err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);

	if (err)

		return err;



	p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);

	if (p_hwirq < 0)

		return p_hwirq;

	out_irq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);

	if (out_irq < 0)

		return out_irq;



	irq_domain_set_hwirq_and_chip(domain, virq, hwirq,

				      &ti_sci_intr_irq_chip,

				      (void *)(uintptr_t)p_hwirq);

				      (void *)(uintptr_t)out_irq);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE