From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN0SU-0007z3-3t for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:13:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XN0SL-0002rU-2g for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:13:50 -0400 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:39653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN0SK-0002rK-SE for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:13:40 -0400 Received: by mail-wi0-f172.google.com with SMTP id n3so7582129wiv.11 for ; Thu, 28 Aug 2014 07:13:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 28 Aug 2014 16:13:22 +0200 Message-Id: <1409235205-21376-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1409235205-21376-1-git-send-email-pbonzini@redhat.com> References: <1409235205-21376-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 5/8] virtio-scsi: Report error if num_queues is 0 or too large List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng From: Fam Zheng No cmd vq surprises guest (Linux panics in virtscsi_probe), too many queues abort qemu (in the following virtio_add_queue). Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 2dd9255..86aba88 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -699,6 +699,12 @@ void virtio_scsi_common_realize(DeviceState *dev, Error **errp, virtio_init(vdev, "virtio-scsi", VIRTIO_ID_SCSI, sizeof(VirtIOSCSIConfig)); + if (s->conf.num_queues <= 0 || s->conf.num_queues > VIRTIO_PCI_QUEUE_MAX) { + error_setg(errp, "Invalid number of queues (= %" PRId32 "), " + "must be a positive integer less than %d.", + s->conf.num_queues, VIRTIO_PCI_QUEUE_MAX); + return; + } s->cmd_vqs = g_malloc0(s->conf.num_queues * sizeof(VirtQueue *)); s->sense_size = VIRTIO_SCSI_SENSE_SIZE; s->cdb_size = VIRTIO_SCSI_CDB_SIZE; -- 1.8.3.1