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 C0BD6A0093 for ; Tue, 10 May 2022 14:30:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BCA364282C; Tue, 10 May 2022 14:30:43 +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 8BA7C4282F for ; Tue, 10 May 2022 14:30:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185842; 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=QVtCBNoXp1T3UkrQkXK3BHROuNrAsJ2jww8jORexjS0=; b=OjIn4SBcD4FphDbyF9jy0TTrRh/0k43TTkBwCBaIW1qYrZYcP/0S2rD4uzr6L/eBvy+b8D PiEgOP6bu7GR7sMZrSA9OQ36mMD3DVkoMCNRYDvOEqX09Js41pMUqynH/rPxkEoRw8CmpY FB8JewW8v2Vg7n7qiFdRyirhZfD1OhI= 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-369-JKUmpDPqMYqWmNCkB2ei0w-1; Tue, 10 May 2022 08:30:40 -0400 X-MC-Unique: JKUmpDPqMYqWmNCkB2ei0w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D088803D4E; Tue, 10 May 2022 12:30:40 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8369340CFD06; Tue, 10 May 2022 12:30:39 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: restrict Rx queue array access to boundary' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:52 +0100 Message-Id: <20220510123010.159523-15-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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"; x-default=true 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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/15/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b3896dba13eae6b410733af101a80b403a474416 Thanks. Kevin --- >From b3896dba13eae6b410733af101a80b403a474416 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Sun, 10 Apr 2022 12:25:27 +0300 Subject: [PATCH] net/mlx5: restrict Rx queue array access to boundary [ upstream commit 1573b07284caf92cad5479b539213c508d5583a6 ] The mlx5_rxq_get() function gets RxQ index and return RxQ priv accordingly. When it gets an invalid index, it accesses out of array bounds which might cause undefined behavior. This patch adds a check for invalid indexes before accessing to array. Fixes: 0cedf34da78f ("net/mlx5: move Rx queue reference count") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rxq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index fe72cf49d3..a5a96c9a60 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -2049,4 +2049,6 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) struct mlx5_priv *priv = dev->data->dev_private; + if (idx >= priv->rxqs_n) + return NULL; MLX5_ASSERT(priv->rxq_privs != NULL); return (*priv->rxq_privs)[idx]; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:22.024999526 +0100 +++ 0015-net-mlx5-restrict-Rx-queue-array-access-to-boundary.patch 2022-05-10 13:24:21.590646343 +0100 @@ -1 +1 @@ -From 1573b07284caf92cad5479b539213c508d5583a6 Mon Sep 17 00:00:00 2001 +From b3896dba13eae6b410733af101a80b403a474416 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1573b07284caf92cad5479b539213c508d5583a6 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 925544ae3d..38fde939e1 100644 +index fe72cf49d3..a5a96c9a60 100644 @@ -27 +28 @@ -@@ -2050,4 +2050,6 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) +@@ -2049,4 +2049,6 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx)