diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2010-01-06 06:54:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-07 01:07:30 -0800 |
| commit | 2467ab9590092ffdf837e9283e84dedd04c93ab3 (patch) | |
| tree | aa528b1edbc10c3c438996aea7901ed199a58888 /drivers/net/atlx | |
| parent | c91aa55e7e65be11d68dffb66be5f7a44506fb54 (diff) | |
| download | op-kernel-dev-2467ab9590092ffdf837e9283e84dedd04c93ab3.zip op-kernel-dev-2467ab9590092ffdf837e9283e84dedd04c93ab3.tar.gz | |
NET: atlx, fix memory leak
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
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atlx')
| -rw-r--r-- | 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; |
