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 DE15EA0350 for ; Mon, 21 Feb 2022 16:41:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9232410F0; Mon, 21 Feb 2022 16:41:35 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 24D3E410F0 for ; Mon, 21 Feb 2022 16:41:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458094; 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=YDrK5l8xfkESNJBzZbHuAbk3BKSGLx3Dc9PXE9c2PxY=; b=L5HPr/VlbFdq3LZGLwzraAT8kI5eldRKONvMyQqXhJtsIC5r8cc2zSL672Yewp0b2giuOF Q3gT6nc7v8qvumqSWSkR21VjO1Bv/1aCJ5MDKs3wa5kp10b5QuQiGv90JeNOQpohZXCXdV 4E4Wal61RkPJW4kPGxoMD15A0dy+vq0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-326-TUJAyiX9N2iZV4iWM2b5Kw-1; Mon, 21 Feb 2022 10:41:31 -0500 X-MC-Unique: TUJAyiX9N2iZV4iWM2b5Kw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 840101853026; Mon, 21 Feb 2022 15:41:30 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA26C7E2EF; Mon, 21 Feb 2022 15:41:29 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: dpdk stable Subject: patch 'regex/mlx5: fix memory allocation check' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:34 +0000 Message-Id: <20220221153625.152324-145-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/6b06137c98e342a5447fc022a4454baac14792c4 Thanks. Kevin --- >From 6b06137c98e342a5447fc022a4454baac14792c4 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Tue, 25 Jan 2022 19:51:41 +0800 Subject: [PATCH] regex/mlx5: fix memory allocation check [ upstream commit 60e9028a8e7e034bcfc7054b12c39f1f2ee2513c ] The wrong field was checked after allocation. Fixes: e3dbbf718ebc ("regex/mlx5: support configuration") Signed-off-by: Weiguo Li --- drivers/regex/mlx5/mlx5_rxp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index 5ead3ca341..51b6e71376 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -149,5 +149,5 @@ mlx5_regex_configure(struct rte_regexdev *dev, priv->qps = rte_zmalloc(NULL, sizeof(struct mlx5_regex_qp) * priv->nb_queues, 0); - if (!priv->nb_queues) { + if (!priv->qps) { DRV_LOG(ERR, "can't allocate qps memory"); rte_errno = ENOMEM; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.734055027 +0000 +++ 0145-regex-mlx5-fix-memory-allocation-check.patch 2022-02-21 15:22:44.299704594 +0000 @@ -1 +1 @@ -From 60e9028a8e7e034bcfc7054b12c39f1f2ee2513c Mon Sep 17 00:00:00 2001 +From 6b06137c98e342a5447fc022a4454baac14792c4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60e9028a8e7e034bcfc7054b12c39f1f2ee2513c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org