From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A7D2A00BE for ; Tue, 15 Mar 2022 14:32:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40E9E4014F; Tue, 15 Mar 2022 14:32:37 +0100 (CET) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mails.dpdk.org (Postfix) with ESMTP id B00824014F for ; Tue, 15 Mar 2022 14:32:35 +0100 (CET) Received: by mail-ej1-f42.google.com with SMTP id pv16so1956797ejb.0 for ; Tue, 15 Mar 2022 06:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MqWDiUgF+cEam/iCD1RSDaq7t9JEw6PHptVoyxqibRA=; b=crhM/TeYUklh/4uVbuKnQxQJ/oTpCAGyUPoqFDaPbarUi2CSHL7RK7Ir2clJ/tt+lt zKn0T63yNy2yd644agJthZyWd6bR7L9ReuZbu8CrhoJwsL+4B0bZdxEGQaQtWvXzkXhC NLuSv9ofs+5lEruJDhs1wMDdDWdA3NGkGze+3Kf+nbFFhEfoJfbgMnqZbyPt5W8fPydN QpyliLXhs3s4unMaf6qmsCLeiqNUYnlElV7kKO/QX8m53H3QoAsXIEoMBMnQ9KrUFoU0 xBLn0+EJt4wdW3a5GuHIyKA6+2+7L6Yf/0UtoOnGnPwJgEibKs8/Bf/wcVeIAjQ5+Yvr LFYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MqWDiUgF+cEam/iCD1RSDaq7t9JEw6PHptVoyxqibRA=; b=iwK+dUkPIvT8HBb8LgI/HS7v3tHp1GfHn4XxDEZfPwFY6UAxTca+d6UJ410fbzX9dW JqUs50U4mXtF1i7A8xOj7Ek8+PSXADcBc7ZbugmmyhbXAyBCRCYYtbuVci4H/fq03MvQ WLnVwOoM+PPFAeykVfiNvbC8WUnefwxgIZsqTgaV18NqVtJyf35E8tJSPQX1CG8JdlMH Rgpa6R6mZ8W0CCGD4RnDUktJHBLZca4bHEJct7pSTkMMx5JEj4KUr9xUCS3tHraQtKlG QwSqF0wgBYjvrp9zhYInQzbTR/zyYzk32GVaLUr3io7EnDJEC0g+bpDsSv8yhtKPy5fE 2szw== X-Gm-Message-State: AOAM530NkZZiM2cc/+qjYtjCVsAs3ggBM65B5wCbyJWQkj6AdpOlMro9 DRd5kKkoam64H2LPaEXRJWsUUYLIilM= X-Google-Smtp-Source: ABdhPJxe4NG1jn8aMLmg5ioycGf2bnkWlUM1EnptSBqCrbaZ0nEj2hkvjxl4UJaolhCYysm4B5sSDQ== X-Received: by 2002:a17:907:7e90:b0:6da:49e4:c7be with SMTP id qb16-20020a1709077e9000b006da49e4c7bemr22772935ejc.493.1647351155174; Tue, 15 Mar 2022 06:32:35 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m3-20020a17090679c300b006cf9ce53354sm8143428ejo.190.2022.03.15.06.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 06:32:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Chenbo Xia Cc: Wenxiang Qian , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix queue number check when setting inflight FD' has been queued to stable release 20.11.5 Date: Tue, 15 Mar 2022 13:32:24 +0000 Message-Id: <20220315133233.635559-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/17/22. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9bac6ad8620073470cceba5848150102b0b9ed19 Thanks. Luca Boccassi --- >From 9bac6ad8620073470cceba5848150102b0b9ed19 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Mon, 14 Feb 2022 16:32:37 +0800 Subject: [PATCH] vhost: fix queue number check when setting inflight FD [ upstream commit 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 ] In function vhost_user_set_inflight_fd, queue number in inflight message is used to access virtqueue. However, queue number could be larger than VHOST_MAX_VRING and cause write OOB as this number will be used to write inflight info in virtqueue structure. This patch checks the queue number to avoid the issue and also make sure virtqueues are allocated before setting inflight information. Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information") Reported-by: Wenxiang Qian Signed-off-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 11d58113a7..c829ce95fb 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -2692,6 +2692,9 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev, case VHOST_USER_SET_VRING_ADDR: vring_idx = msg->payload.addr.index; break; + case VHOST_USER_SET_INFLIGHT_FD: + vring_idx = msg->payload.inflight.num_queues - 1; + break; default: return 0; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-15 12:13:39.104683513 +0000 +++ 0001-vhost-fix-queue-number-check-when-setting-inflight-F.patch 2022-03-15 12:13:39.024180007 +0000 @@ -1 +1 @@ -From 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 Mon Sep 17 00:00:00 2001 +From 9bac6ad8620073470cceba5848150102b0b9ed19 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ - lib/vhost/vhost_user.c | 3 +++ + lib/librte_vhost/vhost_user.c | 3 +++ @@ -23,5 +24,5 @@ -diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c -index 589b950458..1ec4357bee 100644 ---- a/lib/vhost/vhost_user.c -+++ b/lib/vhost/vhost_user.c -@@ -2883,6 +2883,9 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev, +diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c +index 11d58113a7..c829ce95fb 100644 +--- a/lib/librte_vhost/vhost_user.c ++++ b/lib/librte_vhost/vhost_user.c +@@ -2692,6 +2692,9 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev, @@ -29 +30 @@ - vring_idx = ctx->msg.payload.addr.index; + vring_idx = msg->payload.addr.index; @@ -32 +33 @@ -+ vring_idx = ctx->msg.payload.inflight.num_queues - 1; ++ vring_idx = msg->payload.inflight.num_queues - 1;