From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb9pW-000447-Nf for qemu-devel@nongnu.org; Thu, 26 Mar 2015 11:36:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb9pL-0000YY-QZ for qemu-devel@nongnu.org; Thu, 26 Mar 2015 11:36:22 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:47436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb9pL-0000Xo-Ho for qemu-devel@nongnu.org; Thu, 26 Mar 2015 11:36:11 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Mar 2015 15:36:10 -0000 From: Cornelia Huck Date: Thu, 26 Mar 2015 16:36:00 +0100 Message-Id: <1427384162-4994-3-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1427384162-4994-1-git-send-email-cornelia.huck@de.ibm.com> References: <1427384162-4994-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH for-2.3 2/4] virtio-ccw: range check in READ_VQ_CONF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, qemu-stable@nongnu.org Processing for READ_VQ_CONF needs to check whether the requested queue value is actually in the supported range and post a channel program check if not. Cc: qemu-stable@nongnu.org Reviewed-by: David Hildenbrand Signed-off-by: Cornelia Huck --- hw/s390x/virtio-ccw.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index ceb6a45..d32ecaf 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -549,6 +549,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) ret = -EFAULT; } else { vq_config.index = lduw_be_phys(&address_space_memory, ccw.cda); + if (vq_config.index >= VIRTIO_PCI_QUEUE_MAX) { + ret = -EINVAL; + break; + } vq_config.num_max = virtio_queue_get_num(vdev, vq_config.index); stw_be_phys(&address_space_memory, -- 2.3.4