浏览代码

[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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Michael Chan 20 年之前
父节点
当前提交
1c8594b48b
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/net/tg3.c

+ 3 - 1
drivers/net/tg3.c

@@ -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;