[Qemu-devel] [PATCH v9 08/12] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare()

[Kirti Wankhede]

Updated vfio_pci.c file to use vfio_set_irqs_validate_and_prepare()

Signed-off-by: Kirti Wankhede <kwankh...@nvidia.com>
Signed-off-by: Neo Jia <c...@nvidia.com>
Change-Id: I9f3daba89d8dba5cb5b01a8cff420412f30686c7
---
 drivers/vfio/pci/vfio_pci.c | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 1ec0565b48ea..23e7f32a4a07 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -812,35 +812,24 @@ static long vfio_pci_ioctl(void *device_data,
        } else if (cmd == VFIO_DEVICE_SET_IRQS) {
                struct vfio_irq_set hdr;
                u8 *data = NULL;
-               int ret = 0;
+               int max, 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 || hdr.index >= VFIO_PCI_NUM_IRQS ||
-                   hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |
-                                 VFIO_IRQ_SET_ACTION_TYPE_MASK))
-                       return -EINVAL;
+               max = vfio_pci_get_irq_count(vdev, hdr.index);
 
-               if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
-                       size_t size;
-                       int max = vfio_pci_get_irq_count(vdev, hdr.index);
-
-                       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 < hdr.count * size ||
-                           hdr.start >= max || hdr.start + hdr.count > max)
-                               return -EINVAL;
+               ret = vfio_set_irqs_validate_and_prepare(&hdr, max,
+                                                VFIO_PCI_NUM_IRQS, &data_size);
+               if (ret)
+                       return ret;
 
+               if (data_size) {
                        data = memdup_user((void __user *)(arg + minsz),
-                                          hdr.count * size);
+                                           data_size);
                        if (IS_ERR(data))
                                return PTR_ERR(data);
                }
-- 
2.7.0