From 5326636ff2390bb260b3d8d14899b04db205992d Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Wed, 6 Nov 2013 16:58:08 +0800 Subject: virtio-net: only delete bh that existed 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 Reviewed-by: Michael S. Tsirkin Message-id: 1383728288-28469-1-git-send-email-jasowang@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit fe2dafa02de4f80ab36f6e0f4ddfcd6418c03c49) Conflicts: hw/net/virtio-net.c *modified to reflect timer function names for 1.6 Signed-off-by: Michael Roth --- 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 aa1880cb87..bb757b3e67 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1600,7 +1600,7 @@ static int virtio_net_device_exit(DeviceState *qdev) if (q->tx_timer) { qemu_del_timer(q->tx_timer); qemu_free_timer(q->tx_timer); - } else { + } else if (q->tx_bh) { qemu_bh_delete(q->tx_bh); } } -- cgit v1.2.1