diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-03-26 13:19:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-27 10:56:04 -0400 |
commit | 19c9ea363a244f85f90a424f9936e6d56449e33c (patch) | |
tree | 2177ec75f91dd0fe75bf87dbbb20bf50babf5e99 | |
parent | 1dfe82ebd7d8fd43dba9948fdfb31f145014baa0 (diff) |
r8169: fix setting driver_data after register_netdev
pci_set_drvdata() is called only after registering the net_device,
therefore we could run into a NPE if one of the functions using
driver_data is called before it's set.
Fix this by calling pci_set_drvdata() before registering the
net_device.
This fix is a candidate for stable. As far as I can see the
bug has been there in kernel version 3.2 already, therefore
I can't provide a reference which commit is fixed by it.
The fix may need small adjustments per kernel version because
due to other changes the label which is jumped to if
register_netdev() fails has changed over time.
Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 0bf7d1759250..b4779acb6b5c 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -8660,12 +8660,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
8660 | if (!tp->counters) | 8660 | if (!tp->counters) |
8661 | return -ENOMEM; | 8661 | return -ENOMEM; |
8662 | 8662 | ||
8663 | pci_set_drvdata(pdev, dev); | ||
8664 | |||
8663 | rc = register_netdev(dev); | 8665 | rc = register_netdev(dev); |
8664 | if (rc < 0) | 8666 | if (rc < 0) |
8665 | return rc; | 8667 | return rc; |
8666 | 8668 | ||
8667 | pci_set_drvdata(pdev, dev); | ||
8668 | |||
8669 | netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n", | 8669 | netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n", |
8670 | rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr, | 8670 | rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr, |
8671 | (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq); | 8671 | (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq); |