From: Kirti Wankhede <kwankhede@nvidia.com> To: <alex.williamson@redhat.com>, <pbonzini@redhat.com>, <kraxel@redhat.com>, <cjia@nvidia.com> Cc: <qemu-devel@nongnu.org>, <kvm@vger.kernel.org>, <kevin.tian@intel.com>, <jike.song@intel.com>, <bjsdjshi@linux.vnet.ibm.com>, <linux-kernel@vger.kernel.org>, Kirti Wankhede <kwankhede@nvidia.com> Subject: [PATCH v12 17/22] vfio_platform: Updated to use vfio_set_irqs_validate_and_prepare() Date: Mon, 14 Nov 2016 21:12:31 +0530 [thread overview] Message-ID: <1479138156-28905-18-git-send-email-kwankhede@nvidia.com> (raw) In-Reply-To: <1479138156-28905-1-git-send-email-kwankhede@nvidia.com> Updated vfio_platform_common.c file to use vfio_set_irqs_validate_and_prepare() Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com> Signed-off-by: Neo Jia <cjia@nvidia.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: Kirti Wankhede <kwankhede@nvidia.com> To: alex.williamson@redhat.com, pbonzini@redhat.com, kraxel@redhat.com, cjia@nvidia.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, kevin.tian@intel.com, jike.song@intel.com, bjsdjshi@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, Kirti Wankhede <kwankhede@nvidia.com> Subject: [Qemu-devel] [PATCH v12 17/22] vfio_platform: Updated to use vfio_set_irqs_validate_and_prepare() Date: Mon, 14 Nov 2016 21:12:31 +0530 [thread overview] Message-ID: <1479138156-28905-18-git-send-email-kwankhede@nvidia.com> (raw) In-Reply-To: <1479138156-28905-1-git-send-email-kwankhede@nvidia.com> Updated vfio_platform_common.c file to use vfio_set_irqs_validate_and_prepare() Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com> Signed-off-by: Neo Jia <cjia@nvidia.com> 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
next prev parent reply other threads:[~2016-11-14 15:42 UTC|newest] Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-14 15:42 [PATCH v12 00/22] Add Mediated device support Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 01/22] vfio: Mediated device Core driver Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 8:30 ` Dong Jia Shi 2016-11-15 8:30 ` [Qemu-devel] " Dong Jia Shi 2016-11-15 15:16 ` Kirti Wankhede 2016-11-15 15:16 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 02/22] vfio: VFIO based driver for Mediated devices Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 03/22] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 04/22] vfio: Common function to increment container_users Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 05/22] vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 19:43 ` Alex Williamson 2016-11-14 19:43 ` [Qemu-devel] " Alex Williamson 2016-11-15 15:03 ` Kirti Wankhede 2016-11-15 15:03 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 06/22] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 07/22] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 08/22] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 09/22] vfio iommu type1: Add task structure to vfio_dma Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 5:26 ` Alexey Kardashevskiy 2016-11-15 5:26 ` [Qemu-devel] " Alexey Kardashevskiy 2016-11-14 15:42 ` [PATCH v12 10/22] vfio iommu type1: Add support for mediated devices Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 23:25 ` Alex Williamson 2016-11-14 23:25 ` [Qemu-devel] " Alex Williamson 2016-11-15 15:09 ` Kirti Wankhede 2016-11-15 15:09 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 23:58 ` Alex Williamson 2016-11-14 23:58 ` [Qemu-devel] " Alex Williamson 2016-11-15 15:11 ` Kirti Wankhede 2016-11-15 15:11 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 12/22] vfio: Add notifier callback to parent's ops structure of mdev Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 6:45 ` Jike Song 2016-11-15 6:45 ` [Qemu-devel] " Jike Song 2016-11-15 8:11 ` Kirti Wankhede 2016-11-15 8:11 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 9:30 ` Jike Song 2016-11-15 9:30 ` [Qemu-devel] " Jike Song 2016-11-15 15:19 ` Alex Williamson 2016-11-15 15:19 ` [Qemu-devel] " Alex Williamson 2016-11-16 5:52 ` Jike Song 2016-11-16 5:52 ` [Qemu-devel] " Jike Song 2016-11-14 15:42 ` [PATCH v12 13/22] vfio: Introduce common function to add capabilities Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 14/22] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 15/22] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 16/22] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` Kirti Wankhede [this message] 2016-11-14 15:42 ` [Qemu-devel] [PATCH v12 17/22] vfio_platform: " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 18/22] vfio: Define device_api strings Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 19/22] docs: Add Documentation for Mediated devices Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 20/22] docs: Sysfs ABI for mediated device framework Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 21/22] docs: Sample driver to demonstrate how to use Mediated " Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 22/22] MAINTAINERS: Add entry VFIO based Mediated device drivers Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1479138156-28905-18-git-send-email-kwankhede@nvidia.com \ --to=kwankhede@nvidia.com \ --cc=alex.williamson@redhat.com \ --cc=bjsdjshi@linux.vnet.ibm.com \ --cc=cjia@nvidia.com \ --cc=jike.song@intel.com \ --cc=kevin.tian@intel.com \ --cc=kraxel@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.