Re: [PATCH] sparc: kernel/sbus.c: fix memory leakage

[Sam Ravnborg]

On Mon, Jan 14, 2013 at 10:36:08PM +0100, Cong Ding wrote:
> the variable iommu and strbuf are not freed if it goes to error.
> 
> Signed-off-by: Cong Ding <dinggnu@xxxxxxxxx>
> ---
>  arch/sparc/kernel/sbus.c |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c
> index 1271b3a..0b66e53 100644
> --- a/arch/sparc/kernel/sbus.c
> +++ b/arch/sparc/kernel/sbus.c
> @@ -555,10 +555,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
>  
>  	iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
>  	if (!iommu)
> -		goto fatal_memory_error;
> +		goto fatal_iommu_memory_error;
>  	strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC);
>  	if (!strbuf)
> -		goto fatal_memory_error;
> +		goto fatal_strbuf_memory_error;
>  
>  	op->dev.archdata.iommu = iommu;
>  	op->dev.archdata.stc = strbuf;
> @@ -656,6 +656,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
>  	return;
>  
>  fatal_memory_error:
> +	kfree(strbuf);
> +fatal_strbuf_memory_error:
> +	kfree(iommu);
> +fatal_iommu_memory_error:
>  	prom_printf("sbus_iommu_init: Fatal memory allocation error.\n");
>  }
kfree is a noop if passed a null pointer.
So you can just add the missing kfree's to fix this.

	Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/