mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
r8169: NULL pointer dereference on r8169 load
mmio_addr in r8169 needs to be initialized before use Maybe that all tp-> initialization should be moved before rtl_init_mac_address call, but this is enough to get rid of crash in rtl_rar_set due to mmio_addr being uninitialized. Signed-off-by: Petr Vandrovec <petr@vandrovec.name> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f3073ac767
commit
738e1e694b
@ -2154,6 +2154,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
|
||||
spin_lock_init(&tp->lock);
|
||||
|
||||
tp->mmio_addr = ioaddr;
|
||||
|
||||
rtl_init_mac_address(tp, ioaddr);
|
||||
|
||||
/* Get MAC address */
|
||||
@ -2186,7 +2188,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
#endif
|
||||
|
||||
tp->intr_mask = 0xffff;
|
||||
tp->mmio_addr = ioaddr;
|
||||
tp->align = cfg->align;
|
||||
tp->hw_start = cfg->hw_start;
|
||||
tp->intr_event = cfg->intr_event;
|
||||
|
Loading…
Reference in New Issue
Block a user