From nobody Sun May 5 18:59:46 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1577107157; cv=none; d=zohomail.com; s=zohoarc; b=euCxPEBv5UCqhMLSdcuZGwTO3iD6aYzlJD+zYsAc4oQzycFgttTKYv7gIDIilX/KFEKJCBxqLtrCVR3zZl4oRDKJc/lcJSCbtFyQR1aFGoVvRLyfZ5po1fVxwm78R/8sSH4lWb6NovFLv1WWeAQCTWtxmAYptcijSb0cbMJhYHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577107157; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=1RA9wvRmx8i7XkIvHDo1UTjszDgmCQvWJkZq19qaagQ=; b=d1ndg+7v+et1QK6KXYnosNX8AR8+gir2TAq/HxC0VxCxbE74zQnx5vRAo0VogtFGmPdo2wIVOAc0VmCNAMQmkKhfuAWRlyvSlS0cTv8GbksRpF37kYBNu3iqp8ZNdknUE8rNhfarXS/nO4VsBXSGT4oI5/XG9ViIGZK6j/ik6Rc= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1577107157498553.6840952051525; Mon, 23 Dec 2019 05:19:17 -0800 (PST) Received: from localhost ([::1]:56868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijNc7-0004n9-Oo for importer@patchew.org; Mon, 23 Dec 2019 08:19:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41361) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijNbY-0004LJ-SE for qemu-devel@nongnu.org; Mon, 23 Dec 2019 08:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijNbX-00051y-Ln for qemu-devel@nongnu.org; Mon, 23 Dec 2019 08:18:36 -0500 Received: from relay.sw.ru ([185.231.240.75]:52930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ijNbX-0004xu-Ec for qemu-devel@nongnu.org; Mon, 23 Dec 2019 08:18:35 -0500 Received: from dptest2.qa.sw.ru ([10.94.4.71]) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ijNbP-0003NG-8b; Mon, 23 Dec 2019 16:18:27 +0300 From: Denis Plotnikov To: qemu-devel@nongnu.org Subject: [PATCH v1] virtio: stregthen virtqueue size invariants Date: Mon, 23 Dec 2019 16:18:20 +0300 Message-Id: <20191223131820.19300-1-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 1. virtqueue_size is a power of 2 2. virtqueue_size > 2, since seg_max is virtqueue_size - 2 Signed-off-by: Denis Plotnikov --- hw/virtio/virtio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 04716b5f6c..e3ab69061e 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2166,7 +2166,8 @@ void virtio_queue_set_num(VirtIODevice *vdev, int n, = int num) */ if (!!num !=3D !!vdev->vq[n].vring.num || num > VIRTQUEUE_MAX_SIZE || - num < 0) { + num < 2 || + !is_power_of_2(num)) { return; } vdev->vq[n].vring.num =3D num; --=20 2.17.0