* [2.6 patch] drivers/net/tg3.c: fix a memory leak
@ 2006-04-04 19:09 Adrian Bunk
2006-04-06 5:21 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2006-04-04 19:09 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
This patch fixes a memory leak (buf wasn't freed) spotted by the
Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/net/tg3.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- linux-2.6.17-rc1-mm1-full/drivers/net/tg3.c.old 2006-04-04 19:53:24.000000000 +0200
+++ linux-2.6.17-rc1-mm1-full/drivers/net/tg3.c 2006-04-04 19:54:40.000000000 +0200
@@ -8031,15 +8031,19 @@ static int tg3_test_nvram(struct tg3 *tp
if (cpu_to_be32(buf[0]) != TG3_EEPROM_MAGIC) {
u8 *buf8 = (u8 *) buf, csum8 = 0;
for (i = 0; i < size; i++)
csum8 += buf8[i];
- if (csum8 == 0)
- return 0;
- return -EIO;
+ if (csum8 == 0) {
+ err = 0;
+ goto out;
+ }
+
+ err = -EIO;
+ goto out;
}
/* Bootstrap checksum at offset 0x10 */
csum = calc_crc((unsigned char *) buf, 0x10);
if(csum != cpu_to_le32(buf[0x10/4]))
goto out;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [2.6 patch] drivers/net/tg3.c: fix a memory leak
2006-04-04 19:09 [2.6 patch] drivers/net/tg3.c: fix a memory leak Adrian Bunk
@ 2006-04-06 5:21 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2006-04-06 5:21 UTC (permalink / raw)
To: bunk; +Cc: netdev, linux-kernel
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 4 Apr 2006 21:09:35 +0200
> This patch fixes a memory leak (buf wasn't freed) spotted by the
> Coverity checker.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Applied, thanks Adrian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-04-06 5:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-04 19:09 [2.6 patch] drivers/net/tg3.c: fix a memory leak Adrian Bunk
2006-04-06 5:21 ` David S. Miller
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).