lkml.org 
[lkml]   [2014]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 115/124] net,via-rhine: Fix tx_timeout handling
    Date
    3.8.13.18 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Richard Weinberger <richard@nod.at>

    [ Upstream commit a926592f5e4e900f3fa903298c4619a131e60963 ]

    rhine_reset_task() misses to disable the tx scheduler upon reset,
    this can lead to a crash if work is still scheduled while we're resetting
    the tx queue.

    Fixes:
    [ 93.591707] BUG: unable to handle kernel NULL pointer dereference at 0000004c
    [ 93.595514] IP: [<c119d10d>] rhine_napipoll+0x491/0x6

    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/ethernet/via/via-rhine.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
    index 3b96bfa..7eb1963 100644
    --- a/drivers/net/ethernet/via/via-rhine.c
    +++ b/drivers/net/ethernet/via/via-rhine.c
    @@ -1600,6 +1600,7 @@ static void rhine_reset_task(struct work_struct *work)
    goto out_unlock;

    napi_disable(&rp->napi);
    + netif_tx_disable(dev);
    spin_lock_bh(&rp->lock);

    /* clear all descriptors */
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-13 19:41    [W:4.518 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site