lkml.org 
[lkml]   [2007]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 62/69] sky2: fix oops on shutdown
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Stephen Hemminger <shemminger@linux-foundation.org>

    If the device fails during module startup for some reason like unsupported chip
    version then the driver would crash dereferencing a null pointer, on shutdown
    or suspend/resume.

    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>

    ---
    drivers/net/sky2.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    --- linux-2.6.21.1.orig/drivers/net/sky2.c
    +++ linux-2.6.21.1/drivers/net/sky2.c
    @@ -3719,6 +3719,7 @@ err_out_free_regions:
    pci_release_regions(pdev);
    pci_disable_device(pdev);
    err_out:
    + pci_set_drvdata(pdev, NULL);
    return err;
    }

    @@ -3771,6 +3772,9 @@ static int sky2_suspend(struct pci_dev *
    struct sky2_hw *hw = pci_get_drvdata(pdev);
    int i, wol = 0;

    + if (!hw)
    + return 0;
    +
    del_timer_sync(&hw->idle_timer);
    netif_poll_disable(hw->dev[0]);

    @@ -3802,6 +3806,9 @@ static int sky2_resume(struct pci_dev *p
    struct sky2_hw *hw = pci_get_drvdata(pdev);
    int i, err;

    + if (!hw)
    + return 0;
    +
    err = pci_set_power_state(pdev, PCI_D0);
    if (err)
    goto out;
    @@ -3848,6 +3855,9 @@ static void sky2_shutdown(struct pci_dev
    struct sky2_hw *hw = pci_get_drvdata(pdev);
    int i, wol = 0;

    + if (!hw)
    + return;
    +
    del_timer_sync(&hw->idle_timer);
    netif_poll_disable(hw->dev[0]);

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-05-21 21:37    [W:0.022 / U:59.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site