Message ID | 1399995730-28956-2-git-send-email-mst@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, 2014-05-13 at 18:42 +0300, Michael S. Tsirkin wrote: > It's a loop from i < num_sg and the array is VIRTQUEUE_MAX_SIZE - so > it's OK if the value read is VIRTQUEUE_MAX_SIZE. > > Not a big problem in practice as people don't use > such big queues, but it's inelegant. > > Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Cc: qemu-stable@nongnu.org > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/virtio/virtio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 7f4e7ec..3557c17 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -430,7 +430,7 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr, > unsigned int i; > hwaddr len; > > - if (num_sg >= VIRTQUEUE_MAX_SIZE) { > + if (num_sg > VIRTQUEUE_MAX_SIZE) { > error_report("virtio: map attempt out of bounds: %zd > %d", > num_sg, VIRTQUEUE_MAX_SIZE); > exit(1); ACK Thanks, Marcel
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 7f4e7ec..3557c17 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -430,7 +430,7 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr, unsigned int i; hwaddr len; - if (num_sg >= VIRTQUEUE_MAX_SIZE) { + if (num_sg > VIRTQUEUE_MAX_SIZE) { error_report("virtio: map attempt out of bounds: %zd > %d", num_sg, VIRTQUEUE_MAX_SIZE); exit(1);
It's a loop from i < num_sg and the array is VIRTQUEUE_MAX_SIZE - so it's OK if the value read is VIRTQUEUE_MAX_SIZE. Not a big problem in practice as people don't use such big queues, but it's inelegant. Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/virtio/virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)