Skip to content

Commit c8fae27

Browse files
zhanglikernelmstsirkin
authored andcommitted
virtio-pci: Check if is_avq is NULL
[bug] In the virtio_pci_common.c function vp_del_vqs, vp_dev->is_avq is involved to determine whether it is admin virtqueue, but this function vp_dev->is_avq may be empty. For installations, virtio_pci_legacy does not assign a value to vp_dev->is_avq. [fix] Check whether it is vp_dev->is_avq before use. [test] Test with virsh Attach device Before this patch, the following command would crash the guest system After applying the patch, everything seems to be working fine. Signed-off-by: Li Zhang <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent c0a7233 commit c8fae27

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/virtio/virtio_pci_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ void vp_del_vqs(struct virtio_device *vdev)
236236
int i;
237237

238238
list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
239-
if (vp_dev->is_avq(vdev, vq->index))
239+
if (vp_dev->is_avq && vp_dev->is_avq(vdev, vq->index))
240240
continue;
241241

242242
if (vp_dev->per_vq_vectors) {

0 commit comments

Comments
 (0)