Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74470954 authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by David S. Miller
Browse files

xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend() 



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: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
CC: stable@vger.kernel.org
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ba1b689

drivers/net/xen-netfront.c

+2 −1
Original line number Diff line number Diff line
@@ -1387,6 +1387,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)) {
@@ -1741,7 +1743,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);

	}