diff options
| author |   Greg Kurz <groug@kaod.org> | 2020-10-03 12:02:03 +0200 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2020-10-04 03:44:25 -0400 |
| commit | 71878fa46c7e3b40fa7b3f1b6e4ba3f92f1ac359 (patch) | |
| tree | 4ca2925d23f07106e6620943448cd3cb6b9a4ac0 /drivers/vhost | |
| parent | vhost: Don't call access_ok() when using IOTLB (diff) | |
| download | linux-dev-71878fa46c7e3b40fa7b3f1b6e4ba3f92f1ac359.tar.xz linux-dev-71878fa46c7e3b40fa7b3f1b6e4ba3f92f1ac359.zip | |
vhost: Use vhost_get_used_size() in vhost_vring_set_addr()
The open-coded computation of the used size doesn't take the event
into account when the VIRTIO_RING_F_EVENT_IDX feature is present.
Fix that by using vhost_get_used_size().
Fixes: 8ea8cf89e19a ("vhost: support event index")
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kurz <groug@kaod.org>
Link: https://lore.kernel.org/r/160171932300.284610.11846106312938909461.stgit@bahia.lan
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index c3b49975dc28..9d2c225fb518 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1519,8 +1519,7 @@ static long vhost_vring_set_addr(struct vhost_dev *d, /* Also validate log access for used ring if enabled. */ if ((a.flags & (0x1 << VHOST_VRING_F_LOG)) && !log_access_ok(vq->log_base, a.log_guest_addr, - sizeof *vq->used + - vq->num * sizeof *vq->used->ring)) + vhost_get_used_size(vq, vq->num))) return -EINVAL; } |