From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934180AbdCJL4A (ORCPT ); Fri, 10 Mar 2017 06:56:00 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:44547 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936044AbdCJLxw (ORCPT ); Fri, 10 Mar 2017 06:53:52 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Juergen Gross" , "Boris Ostrovsky" , "David S. Miller" Date: Fri, 10 Mar 2017 11:46:10 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 143/199] xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend() In-Reply-To: X-SA-Exim-Connect-IP: 82.70.136.246 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2.87-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Boris Ostrovsky 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 Reviewed-by: Juergen Gross Signed-off-by: David S. Miller [bwh: Backported to 3.2: there's only one RX queue here, and del_timer_sync() was called from xennet_remove() but that's also too late] Signed-off-by: Ben Hutchings --- --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1404,6 +1404,8 @@ static void xennet_disconnect_backend(st spin_unlock_irq(&info->tx_lock); spin_unlock_bh(&info->rx_lock); + del_timer_sync(&info->rx_refill_timer); + if (info->netdev->irq) unbind_from_irqhandler(info->netdev->irq, info->netdev); info->evtchn = info->netdev->irq = 0; @@ -1940,8 +1942,6 @@ static int __devexit xennet_remove(struc unregister_netdev(info->netdev); - del_timer_sync(&info->rx_refill_timer); - free_percpu(info->stats); free_netdev(info->netdev);