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 8F5CCA0032 for ; Fri, 18 Feb 2022 13:44:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89E9840141; Fri, 18 Feb 2022 13:44:35 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id B625540141 for ; Fri, 18 Feb 2022 13:44:34 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id p9so14357041wra.12 for ; Fri, 18 Feb 2022 04:44:34 -0800 (PST) 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=0pr3Gtw9afCj+nA6c+wuzo6d9o/9ahz4iLptHXQrvj8=; b=W0NA3hSNp+7u2l1h9L/Gq0yW68SgMv7MAjBHtzTzc/so2mN41Alogq8doCXzA1D0Co EUkEz8INIs/myS6WH4/dcPZP6XC9FyCM0SC6GX9cl2FreFZh0u56lYjlwhLAw8lePGy+ Ss8eaPMET5+b2b+/5NWXv2GtS+eiK0rzsU/Id7Ybp8mbQGDnh2b7aVYBHBnVq0vr9XoH pLnfCC9kTTP/aXl4q7b5rBmAnAoALd4bYGwk9YcWb5I9MdQm4CPAChajWu4si5zGXbGs yeJwTwWeRKcDqCcibF9zifhaQfmcgftxD+ucvgmpfBJKpR+yuQm8A/L1kwbi4gZYnMd3 Lj9g== 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=0pr3Gtw9afCj+nA6c+wuzo6d9o/9ahz4iLptHXQrvj8=; b=dTjzTyrDfWJG7x3qic0bQjfAbaqCFvTz/fJokzbezhb+ymAKf6vyn2guiV24JSOF6t vwp2JZzxHPeyoIMjmh8xVbyUm8A85haLJ0tcK6SWlzrtpd5ZzBjQPoaaZsZ8aOfpJv3A 4xW2gVFID8qiTlltEDXb3djvOOzW3c5rzhKh+SGHx5vJJ1R+VD7f8langL1BRotYPA+o +Ouzgn1qPByXSnYfFyY74pLJOuVE6L2cpzxtStBsRKHLxMAZSAriUq37DtBZ1858j1Rz MRGKbGA1nq2BVkIkuzr6YGMqdQVAGGCa9NTJZENs+01yaHbK9GXkzj7h8nYDmDAh4aTS IjTA== X-Gm-Message-State: AOAM530ICnpTFvifzfEg337LVpk6eDL+7HKe3Z1dSHcr2lyDjargtqGY KOXx1E0TL8QqboH9/NIRqqA= X-Google-Smtp-Source: ABdhPJy9yR4cNao5n3cG02Uj2ERPOR7bRT2oNrDFJaqU3U9iD2Q25MGmTMmuaXeyB7+ID4LY5pByow== X-Received: by 2002:a5d:6d85:0:b0:1e3:260c:bc0f with SMTP id l5-20020a5d6d85000000b001e3260cbc0fmr5829107wrs.155.1645188274449; Fri, 18 Feb 2022 04:44:34 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id j15sm5080088wmq.6.2022.02.18.04.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:33 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: dpdk stable Subject: patch 'regex/mlx5: fix memory allocation check' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:05 +0000 Message-Id: <20220218123931.1749595-96-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 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 02/20/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/c53cb87b513061b3473a2d9363c89a995f4f86a3 Thanks. Luca Boccassi --- >From c53cb87b513061b3473a2d9363c89a995f4f86a3 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 0753ab3bdc..b7ac6ed4a8 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -989,7 +989,7 @@ mlx5_regex_configure(struct rte_regexdev *dev, dev->data->dev_conf.nb_queue_pairs = priv->nb_queues; 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; return -rte_errno; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.548283299 +0000 +++ 0096-regex-mlx5-fix-memory-allocation-check.patch 2022-02-18 12:37:37.826794957 +0000 @@ -1 +1 @@ -From 60e9028a8e7e034bcfc7054b12c39f1f2ee2513c Mon Sep 17 00:00:00 2001 +From c53cb87b513061b3473a2d9363c89a995f4f86a3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60e9028a8e7e034bcfc7054b12c39f1f2ee2513c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 5ead3ca341..51b6e71376 100644 +index 0753ab3bdc..b7ac6ed4a8 100644 @@ -20 +21 @@ -@@ -148,7 +148,7 @@ mlx5_regex_configure(struct rte_regexdev *dev, +@@ -989,7 +989,7 @@ mlx5_regex_configure(struct rte_regexdev *dev,