From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CFEA3A04DD for ; Wed, 18 Nov 2020 17:38:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 640973B5; Wed, 18 Nov 2020 17:38:16 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id DF9B23B5 for ; Wed, 18 Nov 2020 17:38:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717493; 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=1SIY2kKJyTm8HfJ0XwXcPB9L92ULqNhhbroTBx57cQw=; b=HgPx0rNyA+vsnBXxwFedkQR55KpNhNRKQ3LQ/Uzkcxh0MOzQa1UucqyGN4h3q6iAYnUirO 5k9COOUJx9FKYgmpvZxgIGKDPecsgD58BvPUx9XCEWrv6eRgp75JHWIN6wGwvZNs28cfEO 3De5yQNCyBegkxRKF0cWMVVBuIr5yW8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-58-msciKE8mM2KtPnZqjfIepg-1; Wed, 18 Nov 2020 11:38:08 -0500 X-MC-Unique: msciKE8mM2KtPnZqjfIepg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9179010766B9; Wed, 18 Nov 2020 16:38:07 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 707F55C1A3; Wed, 18 Nov 2020 16:38:06 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Chenbo Xia , dpdk stable Date: Wed, 18 Nov 2020 16:35:45 +0000 Message-Id: <20201118163558.1101823-59-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'vhost: validate index in guest notification API' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c1e34850b7c10c4c8e22f52bd9f73e7184e939ea Thanks. Kevin. --- >From c1e34850b7c10c4c8e22f52bd9f73e7184e939ea Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Mon, 19 Oct 2020 19:34:11 +0200 Subject: [PATCH] vhost: validate index in guest notification API [ upstream commit 366374054b656e049188216e2fa44831749c2a21 ] This patch validates the queue index parameter, in order to ensure neither out-of-bound accesses nor NULL pointer dereferencing happen. Fixes: 9eed6bfd2efb ("vhost: allow to enable or disable features") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- lib/librte_vhost/vhost.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 2fd454441a..61754833c2 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -984,5 +984,10 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) return -1; + if (queue_id >= VHOST_MAX_VRING) + return -1; + vq = dev->virtqueue[queue_id]; + if (!vq) + return -1; rte_spinlock_lock(&vq->access_lock); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:39.047840435 +0000 +++ 0059-vhost-validate-index-in-guest-notification-API.patch 2020-11-18 16:33:37.983215096 +0000 @@ -1 +1 @@ -From 366374054b656e049188216e2fa44831749c2a21 Mon Sep 17 00:00:00 2001 +From c1e34850b7c10c4c8e22f52bd9f73e7184e939ea Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 366374054b656e049188216e2fa44831749c2a21 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 193dafc369..801a1a5098 100644 +index 2fd454441a..61754833c2 100644 @@ -23 +24 @@ -@@ -1353,5 +1353,10 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) +@@ -984,5 +984,10 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)