* [PATCH 1/1] NET: atlx, fix memory leak
@ 2010-01-06 16:54 Jiri Slaby
2010-01-07 0:28 ` J K Cliburn
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Slaby @ 2010-01-06 16:54 UTC (permalink / raw)
To: davem
Cc: linux-kernel, jirislaby, Jay Cliburn, Chris Snook, Jie Yang,
atl1-devel, netdev
Stanse found a memory leak in atl2_get_eeprom. eeprom_buff is not
freed/assigned on all paths. Fix that.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
Cc: Jie Yang <jie.yang@atheros.com>
Cc: atl1-devel@lists.sourceforge.net
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
---
drivers/net/atlx/atl2.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index c0451d7..ec52529 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device *netdev,
return -ENOMEM;
for (i = first_dword; i < last_dword; i++) {
- if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword])))
- return -EIO;
+ if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) {
+ ret_val = -EIO;
+ goto free;
+ }
}
memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
eeprom->len);
+free:
kfree(eeprom_buff);
return ret_val;
--
1.6.5.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] NET: atlx, fix memory leak
2010-01-06 16:54 [PATCH 1/1] NET: atlx, fix memory leak Jiri Slaby
@ 2010-01-07 0:28 ` J K Cliburn
2010-01-07 9:05 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: J K Cliburn @ 2010-01-07 0:28 UTC (permalink / raw)
To: Jiri Slaby
Cc: davem, linux-kernel, jirislaby, Chris Snook, Jie Yang, atl1-devel,
netdev
On Wed, 6 Jan 2010 17:54:16 +0100
Jiri Slaby <jslaby@suse.cz> wrote:
> Stanse found a memory leak in atl2_get_eeprom. eeprom_buff is not
> freed/assigned on all paths. Fix that.
Acked by: Jay Cliburn <jcliburn@gmail.com>
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Jay Cliburn <jcliburn@gmail.com>
> Cc: Chris Snook <chris.snook@gmail.com>
> Cc: Jie Yang <jie.yang@atheros.com>
> Cc: atl1-devel@lists.sourceforge.net
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: netdev@vger.kernel.org
> ---
> drivers/net/atlx/atl2.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
> index c0451d7..ec52529 100644
> --- a/drivers/net/atlx/atl2.c
> +++ b/drivers/net/atlx/atl2.c
> @@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device
> *netdev, return -ENOMEM;
>
> for (i = first_dword; i < last_dword; i++) {
> - if (!atl2_read_eeprom(hw, i*4,
> &(eeprom_buff[i-first_dword])))
> - return -EIO;
> + if (!atl2_read_eeprom(hw, i*4,
> &(eeprom_buff[i-first_dword]))) {
> + ret_val = -EIO;
> + goto free;
> + }
> }
>
> memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
> eeprom->len);
> +free:
> kfree(eeprom_buff);
>
> return ret_val;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] NET: atlx, fix memory leak
2010-01-07 0:28 ` J K Cliburn
@ 2010-01-07 9:05 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2010-01-07 9:05 UTC (permalink / raw)
To: jcliburn
Cc: jslaby, linux-kernel, jirislaby, chris.snook, jie.yang,
atl1-devel, netdev
From: J K Cliburn <jcliburn@gmail.com>
Date: Wed, 6 Jan 2010 18:28:30 -0600
> On Wed, 6 Jan 2010 17:54:16 +0100
> Jiri Slaby <jslaby@suse.cz> wrote:
>
>> Stanse found a memory leak in atl2_get_eeprom. eeprom_buff is not
>> freed/assigned on all paths. Fix that.
>
> Acked by: Jay Cliburn <jcliburn@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-07 9:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-06 16:54 [PATCH 1/1] NET: atlx, fix memory leak Jiri Slaby
2010-01-07 0:28 ` J K Cliburn
2010-01-07 9:05 ` David 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).