lkml.org 
[lkml]   [2008]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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

    ---
    diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
    index 3acfeea..a45c8e8 100644
    --- a/drivers/net/r8169.c
    +++ b/drivers/net/r8169.c
    @@ -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;

    \
     
     \ /
      Last update: 2008-04-17 17:05    [W:8.750 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site