Skip to content

Commit cb2b723

Browse files
hkallweitgregkh
authored andcommitted
r8169: fix setting driver_data after register_netdev
[ Upstream commit 19c9ea3 ] 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 <[email protected]> Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3b1c6b3 commit cb2b723

File tree

1 file changed

+2
-2
lines changed
  • drivers/net/ethernet/realtek

1 file changed

+2
-2
lines changed

drivers/net/ethernet/realtek/r8169.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8699,12 +8699,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
86998699
goto err_out_msi_5;
87008700
}
87018701

8702+
pci_set_drvdata(pdev, dev);
8703+
87028704
rc = register_netdev(dev);
87038705
if (rc < 0)
87048706
goto err_out_cnt_6;
87058707

8706-
pci_set_drvdata(pdev, dev);
8707-
87088708
netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
87098709
rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,
87108710
(u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);

0 commit comments

Comments
 (0)