* [PATCH] virtio_pci_modern: validate features
@ 2015-01-15 18:13 Michael S. Tsirkin
2015-01-15 18:19 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2015-01-15 18:13 UTC (permalink / raw)
To: linux-kernel; +Cc: Rusty Russell, virtualization, Pawel Moll
Spec says devices must set VIRTIO_1 feature bit.
Fail gracefully if they don't.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/virtio/virtio_pci_modern.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 17f0228..a8fd267 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -570,6 +570,7 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
int err, common, isr, notify, device;
u32 notify_length;
u32 notify_offset;
+ u64 features;
check_offsets();
@@ -676,12 +677,19 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
vp_dev->vdev.config = &virtio_pci_config_nodev_ops;
}
+ features = vp_get_features(vdev);
+ if (!features & (1ULL << VIRTIO_F_VERSION_1))
+ goto err_valid_features;
+
vp_dev->config_vector = vp_config_vector;
vp_dev->setup_vq = setup_vq;
vp_dev->del_vq = del_vq;
return 0;
+err_valid_features:
+ if (vp_dev->device)
+ pci_iounmap(pci_dev, vp_dev->device);
err_map_device:
if (vp_dev->notify_base)
pci_iounmap(pci_dev, vp_dev->notify_base);
--
MST
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] virtio_pci_modern: validate features
2015-01-15 18:13 [PATCH] virtio_pci_modern: validate features Michael S. Tsirkin
@ 2015-01-15 18:19 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2015-01-15 18:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Rusty Russell, virtualization, Pawel Moll
On Thu, Jan 15, 2015 at 08:13:44PM +0200, Michael S. Tsirkin wrote:
> Spec says devices must set VIRTIO_1 feature bit.
> Fail gracefully if they don't.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Oops, this is not needed: we already have this in finalize_features
if (!__virtio_test_bit(vdev, VIRTIO_F_VERSION_1)) {
dev_err(&vdev->dev, "virtio: device uses modern interface "
"but does not have VIRTIO_F_VERSION_1\n");
return -EINVAL;
}
Pls disregard this patch.
> ---
> drivers/virtio/virtio_pci_modern.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
> index 17f0228..a8fd267 100644
> --- a/drivers/virtio/virtio_pci_modern.c
> +++ b/drivers/virtio/virtio_pci_modern.c
> @@ -570,6 +570,7 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
> int err, common, isr, notify, device;
> u32 notify_length;
> u32 notify_offset;
> + u64 features;
>
> check_offsets();
>
> @@ -676,12 +677,19 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
> vp_dev->vdev.config = &virtio_pci_config_nodev_ops;
> }
>
> + features = vp_get_features(vdev);
> + if (!features & (1ULL << VIRTIO_F_VERSION_1))
> + goto err_valid_features;
> +
> vp_dev->config_vector = vp_config_vector;
> vp_dev->setup_vq = setup_vq;
> vp_dev->del_vq = del_vq;
>
> return 0;
>
> +err_valid_features:
> + if (vp_dev->device)
> + pci_iounmap(pci_dev, vp_dev->device);
> err_map_device:
> if (vp_dev->notify_base)
> pci_iounmap(pci_dev, vp_dev->notify_base);
> --
> MST
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-15 18:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-15 18:13 [PATCH] virtio_pci_modern: validate features Michael S. Tsirkin
2015-01-15 18:19 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox