Commit 8b7347aa authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vhost: get/put_user -> __get/__put_user 



We do access_ok checks on all ring values on an ioctl,
so we don't need to redo them on each access.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent dfe5ac5b

drivers/vhost/vhost.c

+8 −8
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ int vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq, 


	/* Check it isn't doing very strange things with descriptor numbers. */

	last_avail_idx = vq->last_avail_idx;

	if (unlikely(get_user(vq->avail_idx, &vq->avail->idx))) {

	if (unlikely(__get_user(vq->avail_idx, &vq->avail->idx))) {

		vq_err(vq, "Failed to access avail idx at %p\n",

		       &vq->avail->idx);

		return -EFAULT;
@@ -1116,7 +1116,7 @@ int vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq, 


	/* Grab the next descriptor number they're advertising, and increment

	 * the index we've seen. */

	if (unlikely(get_user(head,

	if (unlikely(__get_user(head,

				&vq->avail->ring[last_avail_idx % vq->num]))) {

		vq_err(vq, "Failed to read head: idx %d address %p\n",

		       last_avail_idx,
@@ -1216,17 +1216,17 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) 
	/* The virtqueue contains a ring of used buffers.  Get a pointer to the

	 * next entry in that used ring. */

	used = &vq->used->ring[vq->last_used_idx % vq->num];

	if (put_user(head, &used->id)) {

	if (__put_user(head, &used->id)) {

		vq_err(vq, "Failed to write used id");

		return -EFAULT;

	}

	if (put_user(len, &used->len)) {

	if (__put_user(len, &used->len)) {

		vq_err(vq, "Failed to write used len");

		return -EFAULT;

	}

	/* Make sure buffer is written before we update index. */

	smp_wmb();

	if (put_user(vq->last_used_idx + 1, &vq->used->idx)) {

	if (__put_user(vq->last_used_idx + 1, &vq->used->idx)) {

		vq_err(vq, "Failed to increment used idx");

		return -EFAULT;

	}
@@ -1319,7 +1319,7 @@ void vhost_signal(struct vhost_dev *dev, struct vhost_virtqueue *vq) 
	 * interrupts. */

	smp_mb();



	if (get_user(flags, &vq->avail->flags)) {

	if (__get_user(flags, &vq->avail->flags)) {

		vq_err(vq, "Failed to get flags");

		return;

	}
@@ -1370,7 +1370,7 @@ bool vhost_enable_notify(struct vhost_virtqueue *vq) 
	/* They could have slipped one in as we were doing that: make

	 * sure it's written, then check again. */

	smp_mb();

	r = get_user(avail_idx, &vq->avail->idx);

	r = __get_user(avail_idx, &vq->avail->idx);

	if (r) {

		vq_err(vq, "Failed to check avail idx at %p: %d\n",

		       &vq->avail->idx, r);