From patchwork Fri Oct 20 08:47:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133059 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B0995431BA; Fri, 20 Oct 2023 10:48:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A4AE40A67; Fri, 20 Oct 2023 10:48:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6D4D3402B8 for ; Fri, 20 Oct 2023 10:48:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eLO6Saj0e0DoyVmFRVUdS2pGCnma22zBL/hNYG3nhFA=; b=KvLIdjXgoK3bj0naNXaSuZRy9vXFIFzItDgSSuPPHlhJYmTOA2zqzi4n/KI+hcETVWNDq/ +g5Cyc+eJKzcOVB7bdYgadHrOB1KfUM9FANOdEFujgzhgUfiS7lCN0sR7tKCZ+kBnypJTO mg+Qk7Yy54FN4LWN6vf6RwqAGtZzIM0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-661-JHL_K4SGO7-dEVtVLfPjKg-1; Fri, 20 Oct 2023 04:48:10 -0400 X-MC-Unique: JHL_K4SGO7-dEVtVLfPjKg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6BE4F88CC4A; Fri, 20 Oct 2023 08:48:10 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ABE140C6F7B; Fri, 20 Oct 2023 08:48:08 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, chenbo.xia@outlook.com, fengli@smartx.com Cc: Maxime Coquelin , stable@dpdk.org Subject: [PATCH v2 1/7] vhost: fix missing vring call check on virtqueue access Date: Fri, 20 Oct 2023 10:47:58 +0200 Message-ID: <20231020084804.3625099-2-maxime.coquelin@redhat.com> In-Reply-To: <20231020084804.3625099-1-maxime.coquelin@redhat.com> References: <20231020084804.3625099-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Acquiring the access lock is not enough to ensure virtqueue's metadata such as vring pointers are valid. The access status must also be checked. Fixes: 6c299bb7322f ("vhost: introduce vring call API") Fixes: c5736998305d ("vhost: fix missing virtqueue lock protection") Fixes: 830f7e790732 ("vhost: add non-blocking API for posting interrupt") Cc: stable@dpdk.org Reported-by: Li Feng Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 7fde412ef3..0d2bc1a48b 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1330,6 +1330,7 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1344,14 +1345,20 @@ rte_vhost_vring_call(int vid, uint16_t vring_idx) rte_rwlock_read_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); - return 0; + return ret; } int @@ -1359,6 +1366,7 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) { struct virtio_net *dev; struct vhost_virtqueue *vq; + int ret = 0; dev = get_device(vid); if (!dev) @@ -1374,14 +1382,20 @@ rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx) if (rte_rwlock_read_trylock(&vq->access_lock)) return -EAGAIN; + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + if (vq_is_packed(dev)) vhost_vring_call_packed(dev, vq); else vhost_vring_call_split(dev, vq); +out_unlock: rte_rwlock_read_unlock(&vq->access_lock); - return 0; + return ret; } uint16_t