From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754963AbcHVJ2d (ORCPT ); Mon, 22 Aug 2016 05:28:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48212 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754625AbcHVJ2b (ORCPT ); Mon, 22 Aug 2016 05:28:31 -0400 Date: Mon, 22 Aug 2016 02:28:18 -0700 From: tip-bot for Shawn Lin Message-ID: Cc: shawn.lin@rock-chips.com, linux-kernel@vger.kernel.org, mingo@kernel.org, marc.zyngier@arm.com, hpa@zytor.com, jonathanh@nvidia.com, tglx@linutronix.de Reply-To: hpa@zytor.com, jonathanh@nvidia.com, tglx@linutronix.de, shawn.lin@rock-chips.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, mingo@kernel.org In-Reply-To: <1471854112-13006-1-git-send-email-shawn.lin@rock-chips.com> References: <1471854112-13006-1-git-send-email-shawn.lin@rock-chips.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] genirq: Fix potential memleak when failing to get irq pm Git-Commit-ID: 4396f46c8c628329bd35ee4b84140b8b001a11eb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4396f46c8c628329bd35ee4b84140b8b001a11eb Gitweb: http://git.kernel.org/tip/4396f46c8c628329bd35ee4b84140b8b001a11eb Author: Shawn Lin AuthorDate: Mon, 22 Aug 2016 16:21:52 +0800 Committer: Thomas Gleixner 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 Cc: Jon Hunter Cc: Marc Zyngier Link: http://lkml.kernel.org/r/1471854112-13006-1-git-send-email-shawn.lin@rock-chips.com Signed-off-by: Thomas Gleixner --- 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);