From patchwork Sun Jan 8 22:41:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 134950 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3F404B6F67 for ; Mon, 9 Jan 2012 09:42:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754722Ab2AHWl3 (ORCPT ); Sun, 8 Jan 2012 17:41:29 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:17791 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754602Ab2AHWl2 (ORCPT ); Sun, 8 Jan 2012 17:41:28 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id D9AD09403D; Sun, 8 Jan 2012 23:41:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id D163F9403B; Sun, 8 Jan 2012 23:41:21 +0100 (CET) Date: Sun, 8 Jan 2012 23:41:21 +0100 (CET) From: Jesper Juhl To: netdev@vger.kernel.org cc: linux-kernel@vger.kernel.org, Alwin Beukers , Pieter-Paul Giesberts , "John W. Linville" , Franky Lin , Arend van Spriel Subject: [PATCH] brcm80211: Don't leak 'vbuffer' in brcmf_sdbrcm_write_vars() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If the memory allocation 'nvram_ularray = kmalloc(varsize, GFP_ATOMIC);' fails we'll leak the memory allocated to 'vbuffer' when we return -ENOMEM from the function. This patch resolves the leak by kfree()'ing the allocated memory before the return. Signed-off-by: Jesper Juhl Acked-by: Arend van Spriel --- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) compile tested only. diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 5a002a2..f7eeee1 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -3119,8 +3119,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus) /* Verify NVRAM bytes */ brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize); nvram_ularray = kmalloc(varsize, GFP_ATOMIC); - if (!nvram_ularray) + if (!nvram_ularray) { + kfree(vbuffer); return -ENOMEM; + } /* Upload image to verify downloaded contents. */ memset(nvram_ularray, 0xaa, varsize);