(Resending patch originally submitted on 20/7-2007 23:41)
Hi,
There's a small and unlikely memory leak in
drivers/pnp/pnpbios/proc.c::proc_read_escd(). It's inside a sanity
check, so it probably won't trigger often (if at all), however it
*is* a potential leak and it's easy to avoid, so let's just fix it :)
While I was in there I also broke a oneline 'if' statement into two
lines - seemed too trivial a changee to warrent a seperate patch.
Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>
---
drivers/pnp/pnpbios/proc.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 8027073..f77b8c4 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -88,7 +88,8 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
}
tmpbuf = kzalloc(escd.escd_size, GFP_KERNEL);
- if (!tmpbuf) return -ENOMEM;
+ if (!tmpbuf)
+ return -ENOMEM;
if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
kfree(tmpbuf);
@@ -100,6 +101,7 @@ static int proc_read_escd(char *buf, char **start, off_t
pos,
/* sanity check */
if (escd_size > MAX_SANE_ESCD_SIZE) {
printk(KERN_ERR "PnPBIOS: proc_read_escd: ESCD size reported by
BIOS read_escd call is too great\n");
+ kfree(tmpbuf);
return -EFBIG;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
