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

Commit 4396f46c authored by Shawn Lin's avatar Shawn Lin Committed by Thomas Gleixner
Browse files

genirq: Fix potential memleak when failing to get irq pm 



Obviously we should free action here if irq_chip_pm_get failed.

Fixes: be45beb2: "genirq: Add runtime power management support for IRQ chips"
Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Link: http://lkml.kernel.org/r/1471854112-13006-1-git-send-email-shawn.lin@rock-chips.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d16c995f

kernel/irq/manage.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1681,8 +1681,10 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, 
	action->dev_id = dev_id;

	action->dev_id = dev_id;





	retval = irq_chip_pm_get(&desc->irq_data);

	retval = irq_chip_pm_get(&desc->irq_data);

	if (retval < 0)

	if (retval < 0) {

		kfree(action);

		return retval;

		return retval;

	}





	chip_bus_lock(desc);

	chip_bus_lock(desc);

	retval = __setup_irq(irq, desc, action);

	retval = __setup_irq(irq, desc, action);
@@ -1985,8 +1987,10 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler, 
	action->percpu_dev_id = dev_id;

	action->percpu_dev_id = dev_id;





	retval = irq_chip_pm_get(&desc->irq_data);

	retval = irq_chip_pm_get(&desc->irq_data);

	if (retval < 0)

	if (retval < 0) {

		kfree(action);

		return retval;

		return retval;

	}





	chip_bus_lock(desc);

	chip_bus_lock(desc);

	retval = __setup_irq(irq, desc, action);

	retval = __setup_irq(irq, desc, action);