Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0516ffd8 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Michael S. Tsirkin
Browse files

vhost/vsock: handle vhost_vq_init_access() error 



Propagate the error when vhost_vq_init_access() fails and set
vq->private_data to NULL.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7a308bb3

drivers/vhost/vsock.c

+9 −4
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static void vhost_vsock_handle_rx_kick(struct vhost_work *work) 


static int vhost_vsock_start(struct vhost_vsock *vsock)

{

	struct vhost_virtqueue *vq;

	size_t i;

	int ret;
@@ -383,19 +384,20 @@ static int vhost_vsock_start(struct vhost_vsock *vsock) 
		goto err;



	for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) {

		struct vhost_virtqueue *vq = &vsock->vqs[i];

		vq = &vsock->vqs[i];



		mutex_lock(&vq->mutex);



		if (!vhost_vq_access_ok(vq)) {

			ret = -EFAULT;

			mutex_unlock(&vq->mutex);

			goto err_vq;

		}



		if (!vq->private_data) {

			vq->private_data = vsock;

			vhost_vq_init_access(vq);

			ret = vhost_vq_init_access(vq);

			if (ret)

				goto err_vq;

		}



		mutex_unlock(&vq->mutex);
@@ -405,8 +407,11 @@ static int vhost_vsock_start(struct vhost_vsock *vsock) 
	return 0;



err_vq:

	vq->private_data = NULL;

	mutex_unlock(&vq->mutex);



	for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) {

		struct vhost_virtqueue *vq = &vsock->vqs[i];

		vq = &vsock->vqs[i];



		mutex_lock(&vq->mutex);

		vq->private_data = NULL;