From: Kok, Auke <auke-jan.h.kok@intel.com>
Date: Tue, 29 Apr 2008 18:18:55 +0000 (-0700)
Subject: e1000e: don't return half-read eeprom on error
X-Git-Tag: v2.6.26-rc2~19^2~4^2
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=f227ec3ca2b7be449fb2156e82b40cceed87a34a;p=safe%2Fjmp%2Flinux-2.6

e1000e: don't return half-read eeprom on error

On a read error, e1000e might have returned uninitialized block of
eeprom data back to userspace. The convention is that 0xff is "empty",
so mark the entire eeprom as empty in case of an error.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 2bb6da0..a14561f 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -494,8 +494,12 @@ static int e1000_get_eeprom(struct net_device *netdev,
 		for (i = 0; i < last_word - first_word + 1; i++) {
 			ret_val = e1000_read_nvm(hw, first_word + i, 1,
 						      &eeprom_buff[i]);
-			if (ret_val)
+			if (ret_val) {
+				/* a read error occurred, throw away the
+				 * result */
+				memset(eeprom_buff, 0xff, sizeof(eeprom_buff));
 				break;
+			}
 		}
 	}