lkml.org 
[lkml]   [2015]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ARM: 8351/1: perf: fix memory leak on return
Date
From: Colin Ian King <colin.king@canonical.com>

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 <colin.king@canonical.com>
---
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


\
 
 \ /
  Last update: 2015-05-15 19:01    [W:0.634 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site