From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kok, Auke" Subject: Re: [PATCH 4/8] e1000e: limit EEPROM size accesses Date: Mon, 31 Mar 2008 09:33:36 -0700 Message-ID: <47F11260.6070808@intel.com> References: <20080328161503.6562.44329.stgit@localhost.localdomain> <20080328161521.6562.23976.stgit@localhost.localdomain> <47EDA25D.7040406@garzik.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net To: Jeff Garzik Return-path: Received: from mga02.intel.com ([134.134.136.20]:13605 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752411AbYCaQfH (ORCPT ); Mon, 31 Mar 2008 12:35:07 -0400 In-Reply-To: <47EDA25D.7040406@garzik.org> Sender: netdev-owner@vger.kernel.org List-ID: Jeff Garzik wrote: > Auke Kok wrote: >> From: Jeff Kirsher >> >> Signed-off-by: Jeff Kirsher >> Signed-off-by: Auke Kok >> --- >> >> drivers/net/e1000e/82571.c | 4 ++++ >> drivers/net/e1000e/es2lan.c | 4 ++++ >> 2 files changed, 8 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c >> index f7e1619..9b46a00 100644 >> --- a/drivers/net/e1000e/82571.c >> +++ b/drivers/net/e1000e/82571.c >> @@ -171,6 +171,10 @@ static s32 e1000_init_nvm_params_82571(struct >> e1000_hw *hw) >> * for setting word_size. >> */ >> size += NVM_WORD_SIZE_BASE_SHIFT; >> + >> + /* EEPROM access above 16k is unsupported */ >> + if (size > 14) >> + size = 14; >> nvm->word_size = 1 << size; >> break; >> } >> diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c >> index e3f4aee..2689e4b 100644 >> --- a/drivers/net/e1000e/es2lan.c >> +++ b/drivers/net/e1000e/es2lan.c >> @@ -178,6 +178,10 @@ static s32 >> e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw) >> * for setting word_size. >> */ >> size += NVM_WORD_SIZE_BASE_SHIFT; >> + >> + /* EEPROM access above 16k is unsupported */ >> + if (size > 14) >> + size = 14; >> nvm->word_size = 1 << size; > > Is this 2.6.25-rc material? hardly, there are no known bugs again us reading too far in the eeprom. 2.6.26+ is fine. Auke