[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-4396f46c8c628329bd35ee4b84140b8b001a11eb@git.kernel.org>
Date: Mon, 22 Aug 2016 02:28:18 -0700
From: tip-bot for Shawn Lin <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: shawn.lin@...k-chips.com, linux-kernel@...r.kernel.org,
mingo@...nel.org, marc.zyngier@....com, hpa@...or.com,
jonathanh@...dia.com, tglx@...utronix.de
Subject: [tip:irq/urgent] genirq: Fix potential memleak when failing to get
irq pm
Commit-ID: 4396f46c8c628329bd35ee4b84140b8b001a11eb
Gitweb: http://git.kernel.org/tip/4396f46c8c628329bd35ee4b84140b8b001a11eb
Author: Shawn Lin <shawn.lin@...k-chips.com>
AuthorDate: Mon, 22 Aug 2016 16:21:52 +0800
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 22 Aug 2016 11:22:44 +0200
genirq: Fix potential memleak when failing to get irq pm
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@...k-chips.com>
Cc: Jon Hunter <jonathanh@...dia.com>
Cc: Marc Zyngier <marc.zyngier@....com>
Link: http://lkml.kernel.org/r/1471854112-13006-1-git-send-email-shawn.lin@rock-chips.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/irq/manage.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 73a2b78..9530fcd 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1681,8 +1681,10 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler,
action->dev_id = dev_id;
retval = irq_chip_pm_get(&desc->irq_data);
- if (retval < 0)
+ if (retval < 0) {
+ kfree(action);
return retval;
+ }
chip_bus_lock(desc);
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;
retval = irq_chip_pm_get(&desc->irq_data);
- if (retval < 0)
+ if (retval < 0) {
+ kfree(action);
return retval;
+ }
chip_bus_lock(desc);
retval = __setup_irq(irq, desc, action);
Powered by blists - more mailing lists