From nobody Tue Nov 26 14:32:18 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=1707343104; cv=none; d=zohomail.com; s=zohoarc; b=DCyKiPeCd++nwcG2QORzHkrrZcewW5gza75HhSMXpLCtGJ2Rs7u5dkeWmJjRmYhpbcL1OnNeF3kavls9zvNvblWpw10JDERpg1+J0QXA6U1hCxG3GIqYG9bKIN2lAcu5oIPyBLA+EpK2emqd3bXeIxbeEChHpJKeaHbZk0HeSto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707343104; 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=6ulCP5y1bPV8WD14M42aT1AWi4MtKmD+olFOV6aACBU=; b=jzdB0LzenqIhC5tUtQrTh9MekEJcvGU1sTGLpJ9a4HTd3HGLJH4ufRrtf25NOBP1lKedj+ilWQIqHiQYN5ZexryU08UuW1L8oVW1LKQcXff3+4dmWtXzUSFwGZh5PoLsEl/bhu/YjtzLqUs8PYFuR9uWLwQ6flN4olcRZnI2osA= 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 170734310485761.38232254648835; Wed, 7 Feb 2024 13:58:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXpu2-0006zx-4L; Wed, 07 Feb 2024 16:56:22 -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 1rXpty-0006vm-Ar for qemu-devel@nongnu.org; Wed, 07 Feb 2024 16:56:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXptw-0007b8-4t for qemu-devel@nongnu.org; Wed, 07 Feb 2024 16:56:18 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-MmW3uiGkO66nrsAXKpVFHg-1; Wed, 07 Feb 2024 16:56:12 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 219B684AE41; Wed, 7 Feb 2024 21:56:12 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87E13492BC7; Wed, 7 Feb 2024 21:56:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707342975; 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=6ulCP5y1bPV8WD14M42aT1AWi4MtKmD+olFOV6aACBU=; b=beBGTWl8RtHDENHfL/pf9OAi1NS0gZW0aghrtSnqZ8mux4jIDdFy1B6tvKEV4d9PWy9Kp8 B0VdgYqJvi/VCK+9kRHd/mqjzqi+8PPX2iH5a0irMu95hi3tyMY/VG5YYsj7keDAQl+E9H Q9lN7FnoY3Q6ysU6REhl8zSBJS8tM6Q= X-MC-Unique: MmW3uiGkO66nrsAXKpVFHg-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 03/16] virtio-blk: add vq_rq[] bounds check in virtio_blk_dma_restart_cb() Date: Wed, 7 Feb 2024 22:55:53 +0100 Message-ID: <20240207215606.206038-4-kwolf@redhat.com> In-Reply-To: <20240207215606.206038-1-kwolf@redhat.com> References: <20240207215606.206038-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.106, 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_H2=-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: 1707343106203100003 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi 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 Message-ID: <20240206190610.107963-4-stefanha@redhat.com> Reviewed-by: Kevin Wolf Reviewed-by: Michael S. Tsirkin Signed-off-by: Kevin Wolf --- 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