[PATCH 1/1] NET: atlx, fix memory leak
in [Kernel]
|
Prev: [PATCH] Don't mkdir -p include/config in the sourcetree when using O=outputdir option
Next: WARNING: at sound/core/sound_oss.c:96 snd_oss_kernel_minor+0xdf/0x120 [snd]()
From: Jiri Slaby on 6 Jan 2010 12:00 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(a)suse.cz> Cc: Jay Cliburn <jcliburn(a)gmail.com> Cc: Chris Snook <chris.snook(a)gmail.com> Cc: Jie Yang <jie.yang(a)atheros.com> Cc: atl1-devel(a)lists.sourceforge.net Cc: "David S. Miller" <davem(a)davemloft.net> Cc: netdev(a)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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |