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 D3EB4A0C45 for ; Thu, 10 Jun 2021 14:08:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE677410F0; Thu, 10 Jun 2021 14:08:11 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id C0FAB4069B for ; Thu, 10 Jun 2021 14:08:09 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTj-0000BE-T4; Thu, 10 Jun 2021 12:08:07 +0000 From: Christian Ehrhardt To: "Min Hu (Connor)" Cc: Bernard Iremonger , dpdk stable Date: Thu, 10 Jun 2021 14:06:24 +0200 Message-Id: <20210610120641.885862-36-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: check flow classifier creation' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/62717ed0e07ec3fb396a071b6c6acaeaeb9d7d4d Thanks. Christian Ehrhardt --- >From 62717ed0e07ec3fb396a071b6c6acaeaeb9d7d4d Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Thu, 22 Apr 2021 14:13:54 +0800 Subject: [PATCH] test: check flow classifier creation [ upstream commit 705b04af1c100c464b6d9238408e84cfeffc489c ] 'cls->cls' will be NULL if flow classifier create has failed, then segmentation fault will occur if the variable is used. This patch fixed it. Fixes: 9c9befea4f57 ("test: add flow classify unit tests") Signed-off-by: Min Hu (Connor) Acked-by: Bernard Iremonger --- app/test/test_flow_classify.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c index ef0b6fdd5c..951606f248 100644 --- a/app/test/test_flow_classify.c +++ b/app/test/test_flow_classify.c @@ -828,6 +828,12 @@ test_flow_classify(void) cls_params.name = "flow_classifier"; cls_params.socket_id = 0; cls->cls = rte_flow_classifier_create(&cls_params); + if (cls->cls == NULL) { + printf("Line %i: flow classifier create has failed!\n", + __LINE__); + rte_free(cls); + return TEST_FAILED; + } /* initialise ACL table params */ table_acl_params.n_rule_fields = RTE_DIM(ipv4_defs); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.770950913 +0200 +++ 0036-test-check-flow-classifier-creation.patch 2021-06-10 14:04:58.066024643 +0200 @@ -1 +1 @@ -From 705b04af1c100c464b6d9238408e84cfeffc489c Mon Sep 17 00:00:00 2001 +From 62717ed0e07ec3fb396a071b6c6acaeaeb9d7d4d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 705b04af1c100c464b6d9238408e84cfeffc489c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org