diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-01-30 12:45:46 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-14 15:25:40 -0800 |
| commit | 765c0f9089fcfebd3f5875a38c00f882ccff62ed (patch) | |
| tree | 88c4fc2701971165c59b3711c4b02ab3782cd6c1 | |
| parent | e7f9f10bcc8dbbf0e09aba6765e9e07bc59910f1 (diff) | |
| download | linux-stable-765c0f9089fcfebd3f5875a38c00f882ccff62ed.tar.gz linux-stable-765c0f9089fcfebd3f5875a38c00f882ccff62ed.tar.bz2 linux-stable-765c0f9089fcfebd3f5875a38c00f882ccff62ed.zip | |
xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
commit 74470954857c264168d2b5a113904cf0cfd27d18 upstream.
rx_refill_timer should be deleted as soon as we disconnect from the
backend since otherwise it is possible for the timer to go off before
we get to xennet_destroy_queues(). If this happens we may dereference
queue->rx.sring which is set to NULL in xennet_disconnect_backend().
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/xen-netfront.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index bf2744e1e3db..0cdcb2169083 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1397,6 +1397,8 @@ static void xennet_disconnect_backend(struct netfront_info *info) for (i = 0; i < num_queues && info->queues; ++i) { struct netfront_queue *queue = &info->queues[i]; + del_timer_sync(&queue->rx_refill_timer); + if (queue->tx_irq && (queue->tx_irq == queue->rx_irq)) unbind_from_irqhandler(queue->tx_irq, queue); if (queue->tx_irq && (queue->tx_irq != queue->rx_irq)) { @@ -1751,7 +1753,6 @@ static void xennet_destroy_queues(struct netfront_info *info) if (netif_running(info->netdev)) napi_disable(&queue->napi); - del_timer_sync(&queue->rx_refill_timer); netif_napi_del(&queue->napi); } |