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

Commit 59f9f2c7 authored by Jason Wang's avatar Jason Wang Committed by Greg Kroah-Hartman
Browse files

vhost: reset metadata cache when initializing new IOTLB 



[ Upstream commit b13f9c63 ]

We need to reset metadata cache during new IOTLB initialization,
otherwise the stale pointers to previous IOTLB may be still accessed
which will lead a use after free.

Reported-by: default avatar <syzbot+c51e6736a1bf614b3272@syzkaller.appspotmail.com>
Fixes: f8894913 ("vhost: introduce O(1) vq metadata cache")
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e125b1cc

drivers/vhost/vhost.c

+6 −3
Original line number Diff line number Diff line
@@ -1578,9 +1578,12 @@ int vhost_init_device_iotlb(struct vhost_dev *d, bool enabled) 
	d->iotlb = niotlb;



	for (i = 0; i < d->nvqs; ++i) {

		mutex_lock(&d->vqs[i]->mutex);

		d->vqs[i]->iotlb = niotlb;

		mutex_unlock(&d->vqs[i]->mutex);

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



		mutex_lock(&vq->mutex);

		vq->iotlb = niotlb;

		__vhost_vq_meta_reset(vq);

		mutex_unlock(&vq->mutex);

	}



	vhost_umem_clean(oiotlb);