AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

genirq: Fix potential memleak when failing to get irq pm

Browse Source 
Obviously we should free action here if irq_chip_pm_get failed.

Fixes: be45beb2df69: "genirq: Add runtime power management support for IRQ chips"
Signed-off-by: Shawn 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: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Shawn Lin 2016-08-22 16:21:52 +08:00 committed by Thomas Gleixner
parent d16c995fe4
commit 4396f46c8c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/irq/manage.c
View File

@ -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);