Re: [PATCH v14 16/22] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare()

[Auger Eric <eric.auger@redhat.com>]

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 <kwankhede@nvidia.com>
> Signed-off-by: Neo Jia <cjia@nvidia.com>
> 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 <eric.auger@redhat.com>

Thanks

Eric