Patch "r8169: fix setting driver_data after register_netdev" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

r8169: fix setting driver_data after register_netdev

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
r8169-fix-setting-driver_data-after-register_netdev.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Heiner Kallweit <[email protected]>
Date: Mon, 26 Mar 2018 19:19:30 +0200
Subject: r8169: fix setting driver_data after register_netdev

From: Heiner Kallweit <[email protected]>

[ 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.

---
 drivers/net/ethernet/realtek/r8169.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -8446,12 +8446,12 @@ static int rtl_init_one(struct pci_dev *
 		goto err_out_msi_5;
 	}
 
+	pci_set_drvdata(pdev, dev);
+
 	rc = register_netdev(dev);
 	if (rc < 0)
 		goto err_out_cnt_6;
 
-	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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/r8169-fix-setting-driver_data-after-register_netdev.patch queue-4.9/pinctrl-meson-gxbb-remove-non-existing-pin-gpiox_22.patch