From nobody Wed Nov 5 02:31:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531762768062562.9160347690877; Mon, 16 Jul 2018 10:39:28 -0700 (PDT) Received: from localhost ([::1]:53007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ff7Sw-00083N-Ff for importer@patchew.org; Mon, 16 Jul 2018 13:39:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ff7Rb-0007TF-VQ for qemu-devel@nongnu.org; Mon, 16 Jul 2018 13:37:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ff7RX-0003AN-2r for qemu-devel@nongnu.org; Mon, 16 Jul 2018 13:37:55 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43182 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ff7RW-00039p-Sr for qemu-devel@nongnu.org; Mon, 16 Jul 2018 13:37:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7270F4001389; Mon, 16 Jul 2018 17:37:49 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-185.ams2.redhat.com [10.36.117.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4289B2156893; Mon, 16 Jul 2018 17:37:48 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com, famz@redhat.com, amit@kernel.org Date: Mon, 16 Jul 2018 18:37:42 +0100 Message-Id: <20180716173743.133393-4-dgilbert@redhat.com> In-Reply-To: <20180716173743.133393-1-dgilbert@redhat.com> References: <20180716173743.133393-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 16 Jul 2018 17:37:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 16 Jul 2018 17:37:49 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dgilbert@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH for 3.1 3/4] virtio-scsi/migration: Allow load_request to fail X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Rather than asserting, check values and return NULL on failure. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Cornelia Huck --- hw/scsi/virtio-scsi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 6301af76ad..3441bfe6d7 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -204,7 +204,11 @@ static void *virtio_scsi_load_request(QEMUFile *f, SCS= IRequest *sreq) uint32_t n; =20 qemu_get_be32s(f, &n); - assert(n < vs->conf.num_queues); + if (n >=3D vs->conf.num_queues) { + error_report("%s: Bad queue number (%d vs %d)", + __func__, n, vs->conf.num_queues); + return NULL; + } req =3D qemu_get_virtqueue_element(vdev, f, sizeof(VirtIOSCSIReq) + vs->cdb_size); if (!req) { @@ -216,13 +220,18 @@ static void *virtio_scsi_load_request(QEMUFile *f, SC= SIRequest *sreq) if (virtio_scsi_parse_req(req, sizeof(VirtIOSCSICmdReq) + vs->cdb_size, sizeof(VirtIOSCSICmdResp) + vs->sense_size) = < 0) { error_report("invalid SCSI request migration data"); - exit(1); + return NULL; } =20 scsi_req_ref(sreq); req->sreq =3D sreq; if (req->sreq->cmd.mode !=3D SCSI_XFER_NONE) { - assert(req->sreq->cmd.mode =3D=3D req->mode); + if (req->sreq->cmd.mode !=3D req->mode) { + error_report("%s: Bad mode (%d vs %d)", + __func__, req->sreq->cmd.mode, req->mode); + scsi_req_unref(sreq); + return NULL; + } } return req; } --=20 2.17.1