* Patch "xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()" has been added to the 4.9-stable tree
@ 2017-02-12 22:15 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2017-02-12 22:15 UTC (permalink / raw)
To: boris.ostrovsky, davem, gregkh, jgross; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xen-netfront-delete-rx_refill_timer-in-xennet_disconnect_backend.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 74470954857c264168d2b5a113904cf0cfd27d18 Mon Sep 17 00:00:00 2001
From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Mon, 30 Jan 2017 12:45:46 -0500
Subject: xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
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>
---
drivers/net/xen-netfront.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1397,6 +1397,8 @@ static void xennet_disconnect_backend(st
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
if (netif_running(info->netdev))
napi_disable(&queue->napi);
- del_timer_sync(&queue->rx_refill_timer);
netif_napi_del(&queue->napi);
}
Patches currently in stable-queue which might be from boris.ostrovsky@oracle.com are
queue-4.9/xen-netfront-delete-rx_refill_timer-in-xennet_disconnect_backend.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-02-12 22:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-12 22:15 Patch "xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()" has been added to the 4.9-stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).