Commit 1c8594b4 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: Fix bug in tg3_set_eeprom() 



Fix a bug in tg3_set_eeprom() when the length is less than 4 and the
offset is not 4-byte aligned.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6af301b

drivers/net/tg3.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -6560,10 +6560,12 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, 
		start = cpu_to_le32(start);

		start = cpu_to_le32(start);

		len += b_offset;

		len += b_offset;

		offset &= ~3;

		offset &= ~3;

		if (len < 4)

			len = 4;

	}

	}





	odd_len = 0;

	odd_len = 0;

	if ((len & 3) && ((len > 4) || (b_offset == 0))) {

	if (len & 3) {

		/* adjustments to end on required 4 byte boundary */

		/* adjustments to end on required 4 byte boundary */

		odd_len = 1;

		odd_len = 1;

		len = (len + 3) & ~3;

		len = (len + 3) & ~3;