From: Alexander Beregalov <a.beregalov@gmail.com>
To: gregkh@suse.de
Cc: linux-kernel@vger.kernel.org,
Alexander Beregalov <a.beregalov@gmail.com>
Subject: [PATCH next 3/6] staging: brcm80211: fix memory leaks
Date: Thu, 10 Mar 2011 05:43:05 +0300 [thread overview]
Message-ID: <1299724988-25351-3-git-send-email-a.beregalov@gmail.com> (raw)
In-Reply-To: <1299724988-25351-1-git-send-email-a.beregalov@gmail.com>
Free resources before exit.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index b74b3c6..28bc553 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -5649,6 +5649,10 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
unsigned char *ularray;
ularray = kmalloc(bus->ramsize, GFP_ATOMIC);
+ if (!ularray) {
+ bcmerror = BCME_NOMEM;
+ goto err;
+ }
/* Upload image to verify downloaded contents. */
offset = 0;
memset(ularray, 0xaa, bus->ramsize);
@@ -5660,7 +5664,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
DHD_ERROR(("%s: error %d on reading %d membytes"
" at 0x%08x\n",
__func__, bcmerror, MEMBLOCK, offset));
- goto err;
+ goto free;
}
offset += MEMBLOCK;
@@ -5674,7 +5678,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
DHD_ERROR(("%s: error %d on reading %d membytes at 0x%08x\n",
__func__, bcmerror,
sizeof(dlarray) - offset, offset));
- goto err;
+ goto free;
}
}
@@ -5682,11 +5686,11 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
DHD_ERROR(("%s: Downloaded image is corrupted.\n",
__func__));
ASSERT(0);
- goto err;
+ goto free;
} else
DHD_ERROR(("%s: Download/Upload/Compare succeeded.\n",
__func__));
-
+free:
kfree(ularray);
}
#endif /* DHD_DEBUG */
--
1.7.4.1
next prev parent reply other threads:[~2011-03-10 2:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 2:43 [PATCH next 1/6] staging: altera-stapl: " Alexander Beregalov
2011-03-10 2:43 ` [PATCH next 2/6] staging: bcm: " Alexander Beregalov
2011-03-11 22:31 ` Greg KH
2011-03-13 19:00 ` Alexander Beregalov
2011-03-10 2:43 ` Alexander Beregalov [this message]
2011-03-10 2:43 ` [PATCH next 4/6] staging: crystalhd: " Alexander Beregalov
2011-03-10 2:43 ` [PATCH next 5/6] staging: hv: " Alexander Beregalov
2011-03-10 2:43 ` [PATCH next 6/6] staging: ste_rmi4: " Alexander Beregalov
2011-03-11 22:29 ` [PATCH next 1/6] staging: altera-stapl: " Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1299724988-25351-3-git-send-email-a.beregalov@gmail.com \
--to=a.beregalov@gmail.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®