Commit a58da53f authored by Stefano Garzarella's avatar Stefano Garzarella Committed by David S. Miller

vhost/vsock: don't check owner in vhost_vsock_stop() while releasing

vhost_vsock_stop() calls vhost_dev_check_owner() to check the device
ownership. It expects current->mm to be valid.

vhost_vsock_stop() is also called by vhost_vsock_dev_release() when
the user has not done close(), so when we are in do_exit(). In this
case current->mm is invalid and we're releasing the device, so we
should clean it anyway.

Let's check the owner only when vhost_vsock_stop() is called
by an ioctl.

When invoked from release we can not fail so we don't check return
code of vhost_vsock_stop(). We need to stop vsock even if it's not
the owner.

Fixes: 433fc58e ("VSOCK: Introduce vhost_vsock.ko")
Cc: stable@vger.kernel.org
Reported-by: syzbot+1e3ea63db39f2b4440e0@syzkaller.appspotmail.com
Reported-and-tested-by: syzbot+3140b17cb44a7b174008@syzkaller.appspotmail.com
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 277f2bb1
...@@ -629,16 +629,18 @@ static int vhost_vsock_start(struct vhost_vsock *vsock) ...@@ -629,16 +629,18 @@ static int vhost_vsock_start(struct vhost_vsock *vsock)
return ret; return ret;
} }
static int vhost_vsock_stop(struct vhost_vsock *vsock) static int vhost_vsock_stop(struct vhost_vsock *vsock, bool check_owner)
{ {
size_t i; size_t i;
int ret; int ret = 0;
mutex_lock(&vsock->dev.mutex); mutex_lock(&vsock->dev.mutex);
ret = vhost_dev_check_owner(&vsock->dev); if (check_owner) {
if (ret) ret = vhost_dev_check_owner(&vsock->dev);
goto err; if (ret)
goto err;
}
for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) { for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) {
struct vhost_virtqueue *vq = &vsock->vqs[i]; struct vhost_virtqueue *vq = &vsock->vqs[i];
...@@ -753,7 +755,12 @@ static int vhost_vsock_dev_release(struct inode *inode, struct file *file) ...@@ -753,7 +755,12 @@ static int vhost_vsock_dev_release(struct inode *inode, struct file *file)
* inefficient. Room for improvement here. */ * inefficient. Room for improvement here. */
vsock_for_each_connected_socket(vhost_vsock_reset_orphans); vsock_for_each_connected_socket(vhost_vsock_reset_orphans);
vhost_vsock_stop(vsock); /* Don't check the owner, because we are in the release path, so we
* need to stop the vsock device in any case.
* vhost_vsock_stop() can not fail in this case, so we don't need to
* check the return code.
*/
vhost_vsock_stop(vsock, false);
vhost_vsock_flush(vsock); vhost_vsock_flush(vsock);
vhost_dev_stop(&vsock->dev); vhost_dev_stop(&vsock->dev);
...@@ -868,7 +875,7 @@ static long vhost_vsock_dev_ioctl(struct file *f, unsigned int ioctl, ...@@ -868,7 +875,7 @@ static long vhost_vsock_dev_ioctl(struct file *f, unsigned int ioctl,
if (start) if (start)
return vhost_vsock_start(vsock); return vhost_vsock_start(vsock);
else else
return vhost_vsock_stop(vsock); return vhost_vsock_stop(vsock, true);
case VHOST_GET_FEATURES: case VHOST_GET_FEATURES:
features = VHOST_VSOCK_FEATURES; features = VHOST_VSOCK_FEATURES;
if (copy_to_user(argp, &features, sizeof(features))) if (copy_to_user(argp, &features, sizeof(features)))
......
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