From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754256AbbEPHKF (ORCPT <rfc822;w@1wt.eu>);
	Sat, 16 May 2015 03:10:05 -0400
Received: from mail-wi0-f179.google.com ([209.85.212.179]:35397 "EHLO
	mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752211AbbEPHKB (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sat, 16 May 2015 03:10:01 -0400
Date: Sat, 16 May 2015 09:09:55 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Colin King <colin.king@canonical.com>
Cc: Will Deacon <will.deacon@arm.com>, Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Russell King <linux@arm.linux.org.uk>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: 8351/1: perf: fix memory leak on return
Message-ID: <20150516070955.GA2429@gmail.com>
References: <1431693789-9679-1-git-send-email-colin.king@canonical.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1431693789-9679-1-git-send-email-colin.king@canonical.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Colin King <colin.king@canonical.com> wrote:

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

So returning from the middle of a function isn't very clean.

Also, why do we return 0 in an error case?

Furthermore, this function already has a (partially hidden) error 
cleanup path:

        if (i == pdev->num_resources)
                cpu_pmu->irq_affinity = irqs;
        else
                kfree(irqs);

So this code should use proper goto driven cleanup. That's faster and 
cleaner, and is less likely to result in bugs like the above.

Thanks,

	Ingo