Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754207AbcKUKvg (ORCPT ); Mon, 21 Nov 2016 05:51:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37718 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754163AbcKUKv2 (ORCPT ); Mon, 21 Nov 2016 05:51:28 -0500 Subject: Re: [PATCH v14 16/22] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() To: Kirti Wankhede , alex.williamson@redhat.com, pbonzini@redhat.com, kraxel@redhat.com, cjia@nvidia.com References: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com> <1479329194-10247-17-git-send-email-kwankhede@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 From: Auger Eric Message-ID: <000fcf50-4715-23ed-2bbe-eddb26a61e53@redhat.com> Date: Mon, 21 Nov 2016 11:51:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1479329194-10247-17-git-send-email-kwankhede@nvidia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 21 Nov 2016 10:51:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2148 Lines: 75 Hi, On 16/11/2016 21:46, Kirti Wankhede wrote: > Updated vfio_pci.c file to use vfio_set_irqs_validate_and_prepare() > > Signed-off-by: Kirti Wankhede > Signed-off-by: Neo Jia > Change-Id: I9f3daba89d8dba5cb5b01a8cff420412f30686c7 > --- > drivers/vfio/pci/vfio_pci.c | 34 +++++++--------------------------- > 1 file changed, 7 insertions(+), 27 deletions(-) > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index 03b5434f4d5b..dcd7c2a99618 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -818,45 +818,25 @@ static long vfio_pci_ioctl(void *device_data, > > } else if (cmd == VFIO_DEVICE_SET_IRQS) { > struct vfio_irq_set hdr; > - size_t size; > u8 *data = NULL; > 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.count >= (U32_MAX - hdr.start) || > - 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.start >= max || hdr.start + hdr.count > max) > - return -EINVAL; > > - switch (hdr.flags & VFIO_IRQ_SET_DATA_TYPE_MASK) { > - case VFIO_IRQ_SET_DATA_NONE: > - size = 0; > - break; > - case VFIO_IRQ_SET_DATA_BOOL: > - size = sizeof(uint8_t); > - break; > - case VFIO_IRQ_SET_DATA_EVENTFD: > - size = sizeof(int32_t); > - break; > - default: > - return -EINVAL; > - } > - > - if (size) { > - if (hdr.argsz - minsz < hdr.count * size) > - 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); > } > Reviewed-by: Eric Auger Thanks Eric