From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
To: Jesper Juhl <jj@chaosbits.net>
Cc: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory.
Date: Fri, 7 Jan 2011 10:02:39 -0500 [thread overview]
Message-ID: <20110107100239.28032e5d@thirdoffive.cmf.nrl.navy.mil> (raw)
In-Reply-To: <alpine.LNX.2.00.1101062203160.13988@swampdragon.chaosbits.net>
instead of duplicating the same section again and again, could you
write something like:
errmsg = "no start record";
goto fail;
...
errmsg = "record to long"
goto fail;
.... whatever ...
return 0;
fail:
release_firmware(fw)
PRINTK(KERN_ERR, "Bad microcode data (%s)\n", errmsg);
return -EINVAL;
}
On Thu, 6 Jan 2011 22:06:37 +0100 (CET)
Jesper Juhl <jj@chaosbits.net> wrote:
>
> Failure to call release_firmware() will result in memory leak in
> drivers/atm/ambassador.c::ucode_init().
> This patch makes sure we always call release_firmware() when needed, thus
> removing the leak(s).
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> ---
> ambassador.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> Compile tested only since I have no way to actually test this.
>
> diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
> index ffe9b65..ab56539 100644
> --- a/drivers/atm/ambassador.c
> +++ b/drivers/atm/ambassador.c
> @@ -1927,7 +1927,7 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) {
> unsigned long start_address;no start record
> const struct ihex_binrec *rec;
> int res;
> -
> +
> res = request_ihex_firmware(&fw, "atmsar11.fw", &dev->pci_dev->dev);
> if (res) {
> PRINTK (KERN_ERR, "Cannot load microcode data");
> @@ -1937,6 +1937,7 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) {
> /* First record contains just the start address */
> rec = (const struct ihex_binrec *)fw->data;
> if (be16_to_cpu(rec->len) != sizeof(__be32) || be32_to_cpu(rec->addr)) {
> + release_firmware(fw);
> PRINTK (KERN_ERR, "Bad microcode data (no start record)");
> return -EINVAL;
> }
> @@ -1950,10 +1951,12 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) {
> PRINTD (DBG_LOAD, "starting region (%x, %u)", be32_to_cpu(rec->addr),
> be16_to_cpu(rec->len));
> if (be16_to_cpu(rec->len) > 4 * MAX_TRANSFER_DATA) {
> + release_firmware(fw);
> PRINTK (KERN_ERR, "Bad microcode data (record too long)");
> return -EINVAL;
> }
> if (be16_to_cpu(rec->len) & 3) {
> + release_firmware(fw);
> PRINTK (KERN_ERR, "Bad microcode data (odd number of bytes)");
> return -EINVAL;
> }
>
>
>
next prev parent reply other threads:[~2011-01-07 15:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 21:06 [PATCH] Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory Jesper Juhl
2011-01-07 15:02 ` chas williams - CONTRACTOR [this message]
2011-01-09 21:32 ` [PATCH v2] " Jesper Juhl
2011-01-09 23:46 ` David Miller
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=20110107100239.28032e5d@thirdoffive.cmf.nrl.navy.mil \
--to=chas@cmf.nrl.navy.mil \
--cc=jj@chaosbits.net \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).