From patchwork Fri Oct 20 08:47:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 133060 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 3838E431BA; Fri, 20 Oct 2023 10:48:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE6A840A8B; Fri, 20 Oct 2023 10:48:18 +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 06CE540A6F for ; Fri, 20 Oct 2023 10:48:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697791695; 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=kzlNweC7zH4RL73PBYFoSyMUhwm5eL1sK333jJt7e5o=; b=RieQTLvh4ra6l7Tgx6wma3ckVj8FndRXcUSwt+Q35NJCgh6FZ8Wx0/sV2rWx9BAF1ATxLy CHzaSfF0ItfaMeSs0LZd6jh0Pusn48zTtyLW+JfJJtjel87auu5o4x2ByGR59g/5KZDSU7 SNpP0hDsQX02SD9XRJucxDLSQVK27d4= 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-341-N_4v58nBMAmsHKHLOKHS-w-1; Fri, 20 Oct 2023 04:48:12 -0400 X-MC-Unique: N_4v58nBMAmsHKHLOKHS-w-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 0E77E886C62; Fri, 20 Oct 2023 08:48:12 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id B11C840C6F7B; Fri, 20 Oct 2023 08:48:10 +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 2/7] vhost: fix missing check on virtqueue access Date: Fri, 20 Oct 2023 10:47:59 +0200 Message-ID: <20231020084804.3625099-3-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: 4e0de8dac853 ("vhost: protect vring access done by application") Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin --- lib/vhost/vhost.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 0d2bc1a48b..446bca1574 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -1418,7 +1418,10 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id) rte_rwlock_write_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; ret = *(volatile uint16_t *)&vq->avail->idx - vq->last_used_idx; @@ -1510,9 +1513,15 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) rte_rwlock_write_lock(&vq->access_lock); + if (unlikely(!vq->access_ok)) { + ret = -1; + goto out_unlock; + } + vq->notif_enable = enable; ret = vhost_enable_guest_notification(dev, vq, enable); +out_unlock: rte_rwlock_write_unlock(&vq->access_lock); return ret; @@ -1605,7 +1614,10 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) rte_rwlock_write_lock(&vq->access_lock); - if (unlikely(!vq->enabled || vq->avail == NULL)) + if (unlikely(!vq->access_ok)) + goto out; + + if (unlikely(!vq->enabled)) goto out; ret = *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx;