Skip to contentSkip to conversation

NET: r8169: fix oops in r8169_get_mac_version

PATCH New Ivan Vecera 1 participant 1 message Apr 17, 2008 Network drivers

lore
Share & tools
lore

Ivan Vecera

author
#0 lore raw

PATCH 1/1 NET: r8169: fix oops in r8169_get_mac_version

When does r8169_get_mac_version find unknown MAC then kernel crash occurs because tp->pci_dev is NULL and is dereferenced. Problem is that the function r8169_get_mac_version is called from rtl8169_init_one at line 1704 but tp->pci_dev is filled at line 1780.

Ivan

---

drivers/net/r8169.c +3 -1
index 3acfeea..a45c8e8 100644
@@ -1700,6 +1700,9 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		msleep_interruptible(1);
 	}
 
+	/* rtl8169_get_mac_version uses tp->pci_dev when unknown MAC found */
+	tp->pci_dev = pdev;
+
 	/* Identify chip attached to board */
 	rtl8169_get_mac_version(tp, ioaddr);
 

@@ -1777,7 +1780,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 
 	tp->intr_mask = 0xffff;
-	tp->pci_dev = pdev;
 	tp->mmio_addr = ioaddr;
 	tp->align = cfg->align;
 	tp->hw_start = cfg->hw_start;