From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vdywm-0006AT-PV for qemu-devel@nongnu.org; Wed, 06 Nov 2013 03:58:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vdywg-0004Vi-Jx for qemu-devel@nongnu.org; Wed, 06 Nov 2013 03:58:44 -0500 From: Jason Wang Date: Wed, 6 Nov 2013 16:58:08 +0800 Message-Id: <1383728288-28469-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH] virtio-net: only delete bh that existed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@amazon.com, qemu-devel@nongnu.org, mst@redhat.com Cc: Jason Wang , qemu-stable@nongnu.org We delete without check whether it existed during exit. This will lead NULL pointer deference since it was created conditionally depends on guest driver status and features. So add a check of existence before trying to delete it. Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 22dbd05..ae51d96 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1601,7 +1601,7 @@ static int virtio_net_device_exit(DeviceState *qdev) if (q->tx_timer) { timer_del(q->tx_timer); timer_free(q->tx_timer); - } else { + } else if (q->tx_bh) { qemu_bh_delete(q->tx_bh); } } -- 1.8.3.2