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 873A645804 for ; Fri, 23 Aug 2024 18:21:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80E68402BE; Fri, 23 Aug 2024 18:21:34 +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 B4A7240295 for ; Fri, 23 Aug 2024 18:21:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430092; 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=jFHwQve9ImGVGnGEW+BNrRFbVHscU0/an+onPq/yTQs=; b=Kh4P/JuVMQU4L8iVWLbzBFJ1goUthiKsxiSTOTD5nlDcaiAfkrPdFbl3allA/K1hiqjtxZ AstQwP01mLjwGA/5vkSuFhwidhqM6ucrRTTYYhuccdCH0e16M7I0fQXjyTHloSoF8G7eyH dHMFVqJ0sCEdPrtw28wjtkDysx8LPcQ= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-597-IC0POwsxPMWySIbyp0MSXA-1; Fri, 23 Aug 2024 12:21:28 -0400 X-MC-Unique: IC0POwsxPMWySIbyp0MSXA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DE83C19560AB; Fri, 23 Aug 2024 16:21:27 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 63D311956053; Fri, 23 Aug 2024 16:21:26 +0000 (UTC) From: Kevin Traynor To: Haifei Luo Cc: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix indexed pool with invalid index' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:59 +0100 Message-ID: <20240823161929.1004778-51-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/ac5f04c92a20375102d6aa622de7243994dc53ac Thanks. Kevin --- >From ac5f04c92a20375102d6aa622de7243994dc53ac Mon Sep 17 00:00:00 2001 From: Haifei Luo Date: Wed, 15 May 2024 12:36:53 +0300 Subject: [PATCH] net/mlx5: fix indexed pool with invalid index [ upstream commit 16a7b5d14e3dfb4d3d385375b94bb2f360883cd6 ] When _mlx5_ipool_get_cache is called, idx may be invalid and the "trunk" is NULL in this case. Assert is not correct and add checks that if trunk is NULL or not. Return NULL If trunk is NULL. Fixes: 42f463395f8f ("net/mlx5: support indexed pool non-lcore operations") Signed-off-by: Haifei Luo Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index b295702fd4..bbe07cd7a3 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -380,5 +380,6 @@ _mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx) trunk_idx = mlx5_trunk_idx_get(pool, idx); trunk = lc->trunks[trunk_idx]; - MLX5_ASSERT(trunk); + if (!trunk) + return NULL; entry_idx = idx - mlx5_trunk_idx_offset_get(pool, trunk_idx); return &trunk->data[entry_idx * pool->cfg.size]; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.424183370 +0100 +++ 0051-net-mlx5-fix-indexed-pool-with-invalid-index.patch 2024-08-23 17:18:09.705430053 +0100 @@ -1 +1 @@ -From 16a7b5d14e3dfb4d3d385375b94bb2f360883cd6 Mon Sep 17 00:00:00 2001 +From ac5f04c92a20375102d6aa622de7243994dc53ac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 16a7b5d14e3dfb4d3d385375b94bb2f360883cd6 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index fc03cc054b..d52119f0be 100644 +index b295702fd4..bbe07cd7a3 100644