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 9107342ECF for ; Thu, 20 Jul 2023 17:29:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D20B40685; Thu, 20 Jul 2023 17:29:56 +0200 (CEST) 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 A5A82400D6 for ; Thu, 20 Jul 2023 17:29:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866994; 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=tT1ET9eCSktYVyJ9G7vK79g0vRKJa8tYalqlzoEoqC8=; b=Y4/K1WPuvh7mrK3UAh1xlRRqrjyp7wkd6M0yHZ1BH966uRGXy2Jmf7Y1ziVLRErIB8muhf ZEL+/eAGpfA7Ik4B2Ivg4L/+uu48fCh7sU1pQdz63x4ekXk9nTjx9FqA2fMmwGNBLAOG7w YIGs1pFqH9QuEg0u+SLz0ljlXyOGiMU= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-327-puI3zS-4O1G5bNH3nFjV-g-1; Thu, 20 Jul 2023 11:20:43 -0400 X-MC-Unique: puI3zS-4O1G5bNH3nFjV-g-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A30CD1C068E5; Thu, 20 Jul 2023 15:20:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B4CD492C13; Thu, 20 Jul 2023 15:20:08 +0000 (UTC) From: Kevin Traynor To: Kamalakannan R Cc: Cristian Dumitrescu , dpdk stable Subject: patch 'pipeline: fix double free for table stats' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:21 +0100 Message-ID: <20230720151942.262154-10-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.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 07/25/23. 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/e531825d4eb211c97b402b602bafe5dc6de5e740 Thanks. Kevin --- >From e531825d4eb211c97b402b602bafe5dc6de5e740 Mon Sep 17 00:00:00 2001 From: Kamalakannan R Date: Mon, 17 Apr 2023 16:52:43 +0530 Subject: [PATCH] pipeline: fix double free for table stats [ upstream commit 2d9e10932d535ea553081b489a25f6fce7ec7996 ] The pointer to the table statistics data structure needs to be set to NULL after free inside the table_build_free(), as this function is called from multiple places, leading to double memory free error. Similar fix for the learner_build_free() function. Fixes: 742b0a57f50e ("pipeline: add table statistics to SWX") Fixes: 4f59d3726147 ("pipeline: support learner tables") Signed-off-by: Kamalakannan R Acked-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index 8d5073cf19..25b5b0955d 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -7636,4 +7636,5 @@ table_build_free(struct rte_swx_pipeline *p) free(p->table_stats); + p->table_stats = NULL; } } @@ -8444,4 +8445,5 @@ learner_build_free(struct rte_swx_pipeline *p) free(p->learner_stats); + p->learner_stats = NULL; } } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:56.423214272 +0100 +++ 0010-pipeline-fix-double-free-for-table-stats.patch 2023-07-20 16:17:54.449749642 +0100 @@ -1 +1 @@ -From 2d9e10932d535ea553081b489a25f6fce7ec7996 Mon Sep 17 00:00:00 2001 +From e531825d4eb211c97b402b602bafe5dc6de5e740 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2d9e10932d535ea553081b489a25f6fce7ec7996 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index dea1378095..da37eda231 100644 +index 8d5073cf19..25b5b0955d 100644 @@ -26 +27 @@ -@@ -8666,4 +8666,5 @@ table_build_free(struct rte_swx_pipeline *p) +@@ -7636,4 +7636,5 @@ table_build_free(struct rte_swx_pipeline *p) @@ -32 +33 @@ -@@ -9580,4 +9581,5 @@ learner_build_free(struct rte_swx_pipeline *p) +@@ -8444,4 +8445,5 @@ learner_build_free(struct rte_swx_pipeline *p)