LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Bo Chen <chenbo@pdx.edu>
To: jeffrey.t.kirsher@intel.com
Cc: davem@davemloft.net, intel-wired-lan@lists.osuosl.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Bo Chen <chenbo@pdx.edu>
Subject: [PATCH] e1000: check the return of pci_get_drvdata() in e1000_remove()
Date: Tue, 22 May 2018 17:17:43 -0700 [thread overview]
Message-ID: <20180523001743.8492-1-chenbo@pdx.edu> (raw)
This check on pci_get_drvdata() prevents potential invalid pointer dereferences,
and is a common practice in *_remove() functions from other drivers, such as
'intel/e100.c', 'amd/pcnet32.c', 'realtek/8139too.c', and 'broadcom/tg3.c'.
Signed-off-by: Bo Chen <chenbo@pdx.edu>
---
drivers/net/ethernet/intel/e1000/e1000_main.c | 41 ++++++++++---------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index d5eb19b86a0a..7f63360dd221 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1283,32 +1283,35 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
static void e1000_remove(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
- struct e1000_adapter *adapter = netdev_priv(netdev);
- struct e1000_hw *hw = &adapter->hw;
- bool disable_dev;
- e1000_down_and_stop(adapter);
- e1000_release_manageability(adapter);
+ if (netdev) {
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct e1000_hw *hw = &adapter->hw;
+ bool disable_dev;
- unregister_netdev(netdev);
+ e1000_down_and_stop(adapter);
+ e1000_release_manageability(adapter);
- e1000_phy_hw_reset(hw);
+ unregister_netdev(netdev);
- kfree(adapter->tx_ring);
- kfree(adapter->rx_ring);
+ e1000_phy_hw_reset(hw);
- if (hw->mac_type == e1000_ce4100)
- iounmap(hw->ce4100_gbe_mdio_base_virt);
- iounmap(hw->hw_addr);
- if (hw->flash_address)
- iounmap(hw->flash_address);
- pci_release_selected_regions(pdev, adapter->bars);
+ kfree(adapter->tx_ring);
+ kfree(adapter->rx_ring);
- disable_dev = !test_and_set_bit(__E1000_DISABLED, &adapter->flags);
- free_netdev(netdev);
+ if (hw->mac_type == e1000_ce4100)
+ iounmap(hw->ce4100_gbe_mdio_base_virt);
+ iounmap(hw->hw_addr);
+ if (hw->flash_address)
+ iounmap(hw->flash_address);
+ pci_release_selected_regions(pdev, adapter->bars);
- if (disable_dev)
- pci_disable_device(pdev);
+ disable_dev = !test_and_set_bit(__E1000_DISABLED, &adapter->flags);
+ free_netdev(netdev);
+
+ if (disable_dev)
+ pci_disable_device(pdev);
+ }
}
/**
--
2.17.0
next reply other threads:[~2018-05-23 0:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-23 0:17 Bo Chen [this message]
2018-05-23 1:47 ` Stephen Hemminger
2018-05-23 3:31 ` Bo Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180523001743.8492-1-chenbo@pdx.edu \
--to=chenbo@pdx.edu \
--cc=davem@davemloft.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--subject='Re: [PATCH] e1000: check the return of pci_get_drvdata() in e1000_remove()' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).