lkml.org 
[lkml]   [2010]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[056/103] atl1: fix resume
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Luca Tettamanti <kronos.it@gmail.com>

    commit ec5a32f67c603b11d68eb283d94eb89a4f6cfce1 upstream.

    adapter->cmb.cmb is initialized when the device is opened and freed when
    it's closed. Accessing it unconditionally during resume results either
    in a crash (NULL pointer dereference, when the interface has not been
    opened yet) or data corruption (when the interface has been used and
    brought down adapter->cmb.cmb points to a deallocated memory area).

    Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>
    Acked-by: Chris Snook <chris.snook@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/atlx/atl1.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/net/atlx/atl1.c
    +++ b/drivers/net/atlx/atl1.c
    @@ -2847,10 +2847,11 @@ static int atl1_resume(struct pci_dev *p
    pci_enable_wake(pdev, PCI_D3cold, 0);

    atl1_reset_hw(&adapter->hw);
    - adapter->cmb.cmb->int_stats = 0;

    - if (netif_running(netdev))
    + if (netif_running(netdev)) {
    + adapter->cmb.cmb->int_stats = 0;
    atl1_up(adapter);
    + }
    netif_device_attach(netdev);

    return 0;



    \
     
     \ /
      Last update: 2010-10-22 20:59    [W:0.021 / U:119.524 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site