Commit 2467ab95 authored Jan 06, 2010 by Jiri Slaby Committed by David S. Miller Jan 07, 2010

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>

parent c91aa55e

drivers/net/atlx/atl2.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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;