Commit 18a3c5f7 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 virtio fixes from Michael Tsirkin:
 "Very late in the cycle but both risky if left unfixed and more or less
  obvious.."

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails
  vhost-vdpa: protect concurrent access to vhost device iotlb
parents 90c911ad be286f84

drivers/vdpa/mlx5/core/mr.c

+3 −1
Original line number Diff line number Diff line
@@ -278,8 +278,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr 
	mr->log_size = log_entity_size;

	mr->nsg = nsg;

	mr->nent = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);

	if (!mr->nent)

	if (!mr->nent) {

		err = -ENOMEM;

		goto err_map;

	}



	err = create_direct_mr(mvdev, mr);

	if (err)

drivers/vhost/vdpa.c

+5 −1
Original line number Diff line number Diff line
@@ -745,9 +745,11 @@ static int vhost_vdpa_process_iotlb_msg(struct vhost_dev *dev, 
	const struct vdpa_config_ops *ops = vdpa->config;

	int r = 0;



	mutex_lock(&dev->mutex);



	r = vhost_dev_check_owner(dev);

	if (r)

		return r;

		goto unlock;



	switch (msg->type) {

	case VHOST_IOTLB_UPDATE:
@@ -768,6 +770,8 @@ static int vhost_vdpa_process_iotlb_msg(struct vhost_dev *dev, 
		r = -EINVAL;

		break;

	}

unlock:

	mutex_unlock(&dev->mutex);



	return r;

}