From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: [UPDATED PATCH 2/7] igb: fix null pointer dereference seen with fiber NICs Date: Mon, 04 Aug 2008 14:59:46 -0700 Message-ID: <20080804215942.16188.76410.stgit@localhost.localdomain> References: <20080804215531.16188.73257.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, davem@davemloft.net, akpm@linux-foundation.org, Alexander Duyck , Jeff Kirsher To: jeff@garzik.org Return-path: Received: from mga11.intel.com ([192.55.52.93]:27053 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752745AbYHDV7r (ORCPT ); Mon, 4 Aug 2008 17:59:47 -0400 In-Reply-To: <20080804215531.16188.73257.stgit@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-ID: From: Alexander Duyck With a fiber or serdes NIC installed the driver was causing a null pointer dereference on driver unload. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher --- drivers/net/igb/igb_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index f23a048..cfed2b0 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1372,7 +1372,8 @@ static void __devexit igb_remove(struct pci_dev *pdev) unregister_netdev(netdev); - if (!igb_check_reset_block(&adapter->hw)) + if (adapter->hw.phy.ops.reset_phy && + !igb_check_reset_block(&adapter->hw)) adapter->hw.phy.ops.reset_phy(&adapter->hw); igb_remove_device(&adapter->hw);