Commit 2c6ffa9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull vdpa fixes from Michael Tsirkin:
 "A couple of fixes that surfaced at the last minute"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost_vdpa: return -EFAULT if copy_to_user() fails
  vdpa: mlx5: fix vdpa/vhost dependencies
parents bb95d607 2c602741

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ obj-$(CONFIG_OF) += of/ 
obj-$(CONFIG_SSB)		+= ssb/

obj-$(CONFIG_BCMA)		+= bcma/

obj-$(CONFIG_VHOST_RING)	+= vhost/

obj-$(CONFIG_VHOST_IOTLB)	+= vhost/

obj-$(CONFIG_VHOST)		+= vhost/

obj-$(CONFIG_VLYNQ)		+= vlynq/

obj-$(CONFIG_GREYBUS)		+= greybus/

drivers/vdpa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ config IFCVF 


config MLX5_VDPA

	bool

	select VHOST_IOTLB

	help

	  Support library for Mellanox VDPA drivers. Provides code that is

	  common for all types of VDPA drivers. The following drivers are planned:

drivers/vhost/vdpa.c

+3 −1
Original line number Diff line number Diff line
@@ -348,7 +348,9 @@ static long vhost_vdpa_get_iova_range(struct vhost_vdpa *v, u32 __user *argp) 
		.last = v->range.last,

	};



	return copy_to_user(argp, &range, sizeof(range));

	if (copy_to_user(argp, &range, sizeof(range)))

		return -EFAULT;

	return 0;

}



static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd,