[PATCH] virtio-mmio: add error check for platform_get_irq

[Ihor Matushchak]

in vm_find_vqs() irq has a wrong type
so, in case of no IRQ resource defined,
wrong parameter will be passed to request_irq()

Signed-off-by: Ihor Matushchak 
---
 drivers/virtio/virtio_mmio.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index f363fbeb5ab0..60dde8ed163b 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -463,9 +463,14 @@ static int vm_find_vqs(struct virtio_device *vdev, 
unsigned nvqs,
   struct irq_affinity *desc)
 {
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
-   unsigned int irq = platform_get_irq(vm_dev->pdev, 0);
+   int irq = platform_get_irq(vm_dev->pdev, 0);
int i, err, queue_idx = 0;
 
+   if (irq < 0) {
+   dev_err(&vdev->dev, "no IRQ resource defined\n");
+   return -ENODEV;
+   }
+
err = request_irq(irq, vm_interrupt, IRQF_SHARED,
dev_name(&vdev->dev), vm_dev);
if (err)
-- 
2.17.1

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

[PATCH v2] virtio-mmio: add error check for platform_get_irq

[Ihor Matushchak]

in vm_find_vqs() irq has a wrong type
so, in case of no IRQ resource defined,
wrong parameter will be passed to request_irq()

Signed-off-by: Ihor Matushchak 
---
Changes in v2:
Don't overwrite error code value.

 drivers/virtio/virtio_mmio.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index f363fbeb5ab0..e09edb5c5e06 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -463,9 +463,14 @@ static int vm_find_vqs(struct virtio_device *vdev, 
unsigned nvqs,
   struct irq_affinity *desc)
 {
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
-   unsigned int irq = platform_get_irq(vm_dev->pdev, 0);
+   int irq = platform_get_irq(vm_dev->pdev, 0);
int i, err, queue_idx = 0;
 
+   if (irq < 0) {
+   dev_err(&vdev->dev, "Cannot get IRQ resource\n");
+   return irq;
+   }
+
err = request_irq(irq, vm_interrupt, IRQF_SHARED,
dev_name(&vdev->dev), vm_dev);
if (err)
-- 
2.17.1

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization