From nobody Tue Nov 26 15:35:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1707246456; cv=none; d=zohomail.com; s=zohoarc; b=eaHrbGEpPOi9UaPl9q3DViXrZ4zhiiLT8TFvFhObyTHBzXiHljGoFbfa3gpJQl2XOQf4GHfwZd1i1NTdDDi93ycATX/lGPUjvXvHFD+ZFOO/bpKBxv88Ifu7vJ48LRzGrDTAODlK8pvkEfl7yxkMXmeo33E96q+LkFHUPl+SDRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707246456; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PNApsZca7sOyl8N6SobE6R14zQv1GO12NmWRtOt+4XQ=; b=K0VDwh2XgHjmFAYX0busQ3WsAueATZNsSIzEzHaPM2F878y32StaqMKyB0abTN5GxOVEHz95coUeU19s4zbIk4/FDPGuJTH6MGg4V4XhalirWyIbPsTn2JMfX/3vOqaRhGgC5yYM67uKsj1fLs/g98i7jGvLBErgfGB4U7YP5ys= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707246456841961.4959169448058; Tue, 6 Feb 2024 11:07:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXQmJ-0008Nh-J1; Tue, 06 Feb 2024 14:06:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXQmA-0008Ls-Ug for qemu-devel@nongnu.org; Tue, 06 Feb 2024 14:06:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXQm9-0000il-F7 for qemu-devel@nongnu.org; Tue, 06 Feb 2024 14:06:34 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-4NXMZMuBPZyNBjsOilPzxg-1; Tue, 06 Feb 2024 14:06:27 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A5223C0F24A; Tue, 6 Feb 2024 19:06:20 +0000 (UTC) Received: from localhost (unknown [10.39.192.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5B2C2166B35; Tue, 6 Feb 2024 19:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707246393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PNApsZca7sOyl8N6SobE6R14zQv1GO12NmWRtOt+4XQ=; b=SqZK2r9h7iEsYpwbFr++uhYo+F9FVBnUGrOP3F0Q+vRkg60wL3c26FFbs+lw/zEgQBe7aT D+xzcoVdQgp09ObRmze0YGKlNEPVsUJZYPkjfvpaOlvzYmUX59/8ArKqWvg83+ScCGszaE ygb2GHJ8ZgGoYEF5AWaRkWtgEUECH+0= X-MC-Unique: 4NXMZMuBPZyNBjsOilPzxg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Michael Roth , Kevin Wolf , "Michael S. Tsirkin" , Markus Armbruster , Hanna Reitz , qemu-block@nongnu.org, Manos Pitsidianakis Subject: [PATCH v2 3/5] virtio-blk: add vq_rq[] bounds check in virtio_blk_dma_restart_cb() Date: Tue, 6 Feb 2024 14:06:08 -0500 Message-ID: <20240206190610.107963-4-stefanha@redhat.com> In-Reply-To: <20240206190610.107963-1-stefanha@redhat.com> References: <20240206190610.107963-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.294, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1707246457409100001 Content-Type: text/plain; charset="utf-8" Hanna Czenczek noted that the array index in virtio_blk_dma_restart_cb() is not bounds-checked: g_autofree VirtIOBlockReq **vq_rq =3D g_new0(VirtIOBlockReq *, num_queues= ); ... while (rq) { VirtIOBlockReq *next =3D rq->next; uint16_t idx =3D virtio_get_queue_index(rq->vq); rq->next =3D vq_rq[idx]; ^^^^^^^^^^ The code is correct because both rq->vq and vq_rq[] depend on num_queues, but this is indirect and not 100% obvious. Add an assertion. Suggested-by: Hanna Czenczek Reviewed-by: Manos Pitsidianakis Reviewed-by: Hanna Czenczek Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e430ba583c..31212506ca 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -1209,6 +1209,8 @@ static void virtio_blk_dma_restart_cb(void *opaque, b= ool running, VirtIOBlockReq *next =3D rq->next; uint16_t idx =3D virtio_get_queue_index(rq->vq); =20 + /* Only num_queues vqs were created so vq_rq[idx] is within bounds= */ + assert(idx < num_queues); rq->next =3D vq_rq[idx]; vq_rq[idx] =3D rq; rq =3D next; --=20 2.43.0