Commit 6d431f6e authored by Jason Wang's avatar Jason Wang Committed by Greg Kroah-Hartman

vhost: synchronize IOTLB message with dev cleanup

[ Upstream commit 1b15ad68 ]

DaeRyong Jeong reports a race between vhost_dev_cleanup() and
vhost_process_iotlb_msg():

Thread interleaving:
CPU0 (vhost_process_iotlb_msg)			CPU1 (vhost_dev_cleanup)
(In the case of both VHOST_IOTLB_UPDATE and
VHOST_IOTLB_INVALIDATE)

=====						=====
						vhost_umem_clean(dev->iotlb);
if (!dev->iotlb) {
	        ret = -EFAULT;
		        break;
}
						dev->iotlb = NULL;

The reason is we don't synchronize between them, fixing by protecting
vhost_process_iotlb_msg() with dev mutex.
Reported-by: default avatarDaeRyong Jeong <threeearcat@gmail.com>
Fixes: 6b1e6cc7 ("vhost: new device IOTLB API")
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2bb9406
...@@ -993,6 +993,7 @@ static int vhost_process_iotlb_msg(struct vhost_dev *dev, ...@@ -993,6 +993,7 @@ static int vhost_process_iotlb_msg(struct vhost_dev *dev,
{ {
int ret = 0; int ret = 0;
mutex_lock(&dev->mutex);
vhost_dev_lock_vqs(dev); vhost_dev_lock_vqs(dev);
switch (msg->type) { switch (msg->type) {
case VHOST_IOTLB_UPDATE: case VHOST_IOTLB_UPDATE:
...@@ -1024,6 +1025,8 @@ static int vhost_process_iotlb_msg(struct vhost_dev *dev, ...@@ -1024,6 +1025,8 @@ static int vhost_process_iotlb_msg(struct vhost_dev *dev,
} }
vhost_dev_unlock_vqs(dev); vhost_dev_unlock_vqs(dev);
mutex_unlock(&dev->mutex);
return ret; return ret;
} }
ssize_t vhost_chr_write_iter(struct vhost_dev *dev, ssize_t vhost_chr_write_iter(struct vhost_dev *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment