From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbQCZ-000792-Cl for qemu-devel@nongnu.org; Fri, 27 Mar 2015 05:05:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbQCU-0000J2-4z for qemu-devel@nongnu.org; Fri, 27 Mar 2015 05:05:15 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:45148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbQCT-0000IB-RQ for qemu-devel@nongnu.org; Fri, 27 Mar 2015 05:05:10 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 27 Mar 2015 09:05:09 -0000 Message-ID: <55151D41.8090407@de.ibm.com> Date: Fri, 27 Mar 2015 10:05:05 +0100 From: Christian Borntraeger MIME-Version: 1.0 References: <1427384162-4994-1-git-send-email-cornelia.huck@de.ibm.com> <1427384162-4994-3-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1427384162-4994-3-git-send-email-cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [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: Cornelia Huck , qemu-devel@nongnu.org Cc: jfrei@linux.vnet.ibm.com, agraf@suse.de, qemu-stable@nongnu.org Am 26.03.2015 um 16:36 schrieb Cornelia Huck: > 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 Acked-by: Christian Borntraeger > --- > 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, >