mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 23:36:23 +09:00
vhost: Use vhost_get_used_size() in vhost_vring_set_addr()
commit 71878fa46c7e3b40fa7b3f1b6e4ba3f92f1ac359 upstream.
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: 8ea8cf89e1
("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
57b47abc1a
commit
920a61ddd3
|
@ -1545,8 +1545,7 @@ static long vhost_vring_set_addr(struct vhost_dev *d,
|
||||||
/* Also validate log access for used ring if enabled. */
|
/* Also validate log access for used ring if enabled. */
|
||||||
if ((a.flags & (0x1 << VHOST_VRING_F_LOG)) &&
|
if ((a.flags & (0x1 << VHOST_VRING_F_LOG)) &&
|
||||||
!log_access_ok(vq->log_base, a.log_guest_addr,
|
!log_access_ok(vq->log_base, a.log_guest_addr,
|
||||||
sizeof *vq->used +
|
vhost_get_used_size(vq, vq->num)))
|
||||||
vq->num * sizeof *vq->used->ring))
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user