Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e10f44b1 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Greg Kroah-Hartman
Browse files

r8169: fix setting driver_data after register_netdev 




[ Upstream commit 19c9ea363a244f85f90a424f9936e6d56449e33c ]

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: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44c05b35

drivers/net/ethernet/realtek/r8169.c

+2 −2
Original line number Diff line number Diff line
@@ -8278,12 +8278,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	tp->rtl_fw = RTL_FIRMWARE_UNKNOWN;



	pci_set_drvdata(pdev, dev);



	rc = register_netdev(dev);

	if (rc < 0)

		goto err_out_msi_4;



	pci_set_drvdata(pdev, dev);



	netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",

		   rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,

		   (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);