From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1945925AbbEOMpY (ORCPT ); Fri, 15 May 2015 08:45:24 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:43493 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161072AbbEOMpS (ORCPT ); Fri, 15 May 2015 08:45:18 -0400 From: Colin King To: Will Deacon , Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Russell King , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] ARM: 8351/1: perf: fix memory leak on return Date: Fri, 15 May 2015 13:43:09 +0100 Message-Id: <1431693789-9679-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Recent commit 3b8786ff7a1b31645ae2c26a2ec32dbd42ac1094 ("ARM: 8352/1: perf: Fix the pmu node name in warning message") introduced a memory leak of irqs on the "Don't bother with PPIs" return path. This was picked up by static analysis by cppcheck: [arch/arm/kernel/perf_event_cpu.c:315]: (error) Memory leak: irqs simpele fix is to free irqs when returning. Signed-off-by: Colin Ian King --- arch/arm/kernel/perf_event_cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c index 213919b..9e5b2a5 100644 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c @@ -311,8 +311,10 @@ static int of_pmu_irq_cfg(struct platform_device *pdev) /* Don't bother with PPIs; they're already affine */ irq = platform_get_irq(pdev, 0); - if (irq >= 0 && irq_is_percpu(irq)) + if (irq >= 0 && irq_is_percpu(irq)) { + kfree(irqs); return 0; + } for (i = 0; i < pdev->num_resources; ++i) { struct device_node *dn; -- 2.1.4