Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/mst/vhost * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: fix out of range array access
git-mirror · Mar 1, 2010 · 4805a1b · 4805a1b
2 parents ac0f6f9 + 3119815
commit 4805a1b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
@@ -473,7 +473,8 @@ static void vp_del_vqs(struct virtio_device *vdev)
 
 	list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
 		info = vq->priv;
-		if (vp_dev->per_vq_vectors)
+		if (vp_dev->per_vq_vectors &&
+			info->msix_vector != VIRTIO_MSI_NO_VECTOR)
 			free_irq(vp_dev->msix_entries[info->msix_vector].vector,
 				 vq);
 		vp_del_vq(vq);