Skip to content

Commit

Permalink
[TG3]: Fix bug in tg3_set_eeprom()
Browse files Browse the repository at this point in the history
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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael Chan authored and David S. Miller committed Apr 22, 2005
1 parent e6af301 commit 1c8594b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -6560,10 +6560,12 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
start = cpu_to_le32(start);
len += b_offset;
offset &= ~3;
if (len < 4)
len = 4;
}

odd_len = 0;
if ((len & 3) && ((len > 4) || (b_offset == 0))) {
if (len & 3) {
/* adjustments to end on required 4 byte boundary */
odd_len = 1;
len = (len + 3) & ~3;
Expand Down

0 comments on commit 1c8594b

Please sign in to comment.