qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v11 17/22] vfio_platform: Updated to use vfio_set_ir


From: Kirti Wankhede
Subject: [Qemu-devel] [PATCH v11 17/22] vfio_platform: Updated to use vfio_set_irqs_validate_and_prepare()
Date: Sat, 5 Nov 2016 02:40:51 +0530

Updated vfio_platform_common.c file to use
vfio_set_irqs_validate_and_prepare()

Signed-off-by: Kirti Wankhede <address@hidden>
Signed-off-by: Neo Jia <address@hidden>
Change-Id: Id87cd6b78ae901610b39bf957974baa6f40cd7b0
---
 drivers/vfio/platform/vfio_platform_common.c | 31 +++++++---------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/drivers/vfio/platform/vfio_platform_common.c 
b/drivers/vfio/platform/vfio_platform_common.c
index d78142830754..4c27f4be3c3d 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -364,36 +364,21 @@ static long vfio_platform_ioctl(void *device_data,
                struct vfio_irq_set hdr;
                u8 *data = NULL;
                int ret = 0;
+               size_t data_size = 0;
 
                minsz = offsetofend(struct vfio_irq_set, count);
 
                if (copy_from_user(&hdr, (void __user *)arg, minsz))
                        return -EFAULT;
 
-               if (hdr.argsz < minsz)
-                       return -EINVAL;
-
-               if (hdr.index >= vdev->num_irqs)
-                       return -EINVAL;
-
-               if (hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |
-                                 VFIO_IRQ_SET_ACTION_TYPE_MASK))
-                       return -EINVAL;
-
-               if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
-                       size_t size;
-
-                       if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL)
-                               size = sizeof(uint8_t);
-                       else if (hdr.flags & VFIO_IRQ_SET_DATA_EVENTFD)
-                               size = sizeof(int32_t);
-                       else
-                               return -EINVAL;
-
-                       if (hdr.argsz - minsz < size)
-                               return -EINVAL;
+               ret = vfio_set_irqs_validate_and_prepare(&hdr, vdev->num_irqs,
+                                                vdev->num_irqs, &data_size);
+               if (ret)
+                       return ret;
 
-                       data = memdup_user((void __user *)(arg + minsz), size);
+               if (data_size) {
+                       data = memdup_user((void __user *)(arg + minsz),
+                                           data_size);
                        if (IS_ERR(data))
                                return PTR_ERR(data);
                }
-- 
2.7.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]