| Message ID | 1389735996-4692-1-git-send-email-richard@nod.at |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Richard Weinberger <richard@nod.at> Date: Tue, 14 Jan 2014 22:46:36 +0100 > 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> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index cce6c4b..ef312bc 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -1618,6 +1618,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 */
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> --- drivers/net/ethernet/via/via-rhine.c | 1 + 1 file changed, 1 insertion(+)