Просмотр исходного кода

net: thunder: Check for driver data in nicvf_remove()

In some cases the crash is caused by nicvf_remove() being called from
outside. For example, if we try to feed the device to vfio after the
probe has failed for some reason. So, move the check to better place.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Pavel Fedin 10 лет назад
Родитель
Сommit
7750130d93
1 измененных файлов с 8 добавлено и 5 удалено
  1. 8 5
      drivers/net/ethernet/cavium/thunder/nicvf_main.c

+ 8 - 5
drivers/net/ethernet/cavium/thunder/nicvf_main.c

@@ -1583,8 +1583,14 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 static void nicvf_remove(struct pci_dev *pdev)
 static void nicvf_remove(struct pci_dev *pdev)
 {
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct nicvf *nic = netdev_priv(netdev);
-	struct net_device *pnetdev = nic->pnicvf->netdev;
+	struct nicvf *nic;
+	struct net_device *pnetdev;
+
+	if (!netdev)
+		return;
+
+	nic = netdev_priv(netdev);
+	pnetdev = nic->pnicvf->netdev;
 
 
 	/* Check if this Qset is assigned to different VF.
 	/* Check if this Qset is assigned to different VF.
 	 * If yes, clean primary and all secondary Qsets.
 	 * If yes, clean primary and all secondary Qsets.
@@ -1600,9 +1606,6 @@ static void nicvf_remove(struct pci_dev *pdev)
 
 
 static void nicvf_shutdown(struct pci_dev *pdev)
 static void nicvf_shutdown(struct pci_dev *pdev)
 {
 {
-	if (!pci_get_drvdata(pdev))
-		return;
-
 	nicvf_remove(pdev);
 	nicvf_remove(pdev);
 }
 }