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 C8BE541D52 for ; Thu, 23 Feb 2023 16:08:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C4A04432D2; Thu, 23 Feb 2023 16:08:50 +0100 (CET) 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 5B6D4432C9 for ; Thu, 23 Feb 2023 16:08:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164928; 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=DlLDvn+AsSvpZBzCu4Pn+AdNhIhrAEG9FThfF4YHCN0=; b=FBz0OvYifQCxf9a+akyYTJGkQCqMcU4LqGTYosqpVjoVxE2UsxwNSoCmhRzAcpZ598MrSR 7iiBKVMH/Zx3L/P5Il3Gbb6n1sSP8Fx79P7mJLvOPWutjDc0nzuQDNgnRdIlaZHBSdb66g fVovvErFQ9yr+8baaX0pC8qZ6xDbRxo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [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-353-X34_yIf5OLqbzVRnjYHrFQ-1; Thu, 23 Feb 2023 10:08:45 -0500 X-MC-Unique: X34_yIf5OLqbzVRnjYHrFQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 30CD3280558B; Thu, 23 Feb 2023 15:08:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 440A22166B29; Thu, 23 Feb 2023 15:08:43 +0000 (UTC) From: Kevin Traynor To: Volodymyr Fialko Cc: Stephen Hemminger , dpdk stable Subject: patch 'test/reorder: fix double free of drained buffers' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:26 +0000 Message-Id: <20230223150631.723699-95-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 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/28/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/fa627c973b378a630b52b0e21fd4d743056ff659 Thanks. Kevin --- >From fa627c973b378a630b52b0e21fd4d743056ff659 Mon Sep 17 00:00:00 2001 From: Volodymyr Fialko Date: Sat, 7 Jan 2023 16:19:39 +0100 Subject: [PATCH] test/reorder: fix double free of drained buffers [ upstream commit d51955ea93fba1873e9c2b86a911e114787bdd4d ] Set to zero array of drained buffers after free, to prevent freeing them one more time. Discovered with enabled `RTE_LIBRTE_MEMPOOL_DEBUG`. Fixes: ecd867faa860 ("test/reorder: fix freeing mbuf twice") Signed-off-by: Volodymyr Fialko Acked-by: Stephen Hemminger --- app/test/test_reorder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/test/test_reorder.c b/app/test/test_reorder.c index 1c4226da65..69b63bceba 100644 --- a/app/test/test_reorder.c +++ b/app/test/test_reorder.c @@ -271,4 +271,5 @@ test_reorder_drain(void) if (robufs[0] != NULL) rte_pktmbuf_free(robufs[0]); + memset(robufs, 0, sizeof(robufs)); /* Insert more packets @@ -307,4 +308,5 @@ test_reorder_drain(void) rte_pktmbuf_free(robufs[i]); } + memset(robufs, 0, sizeof(robufs)); /* -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:26.086706833 +0000 +++ 0095-test-reorder-fix-double-free-of-drained-buffers.patch 2023-02-23 14:46:23.886236370 +0000 @@ -1 +1 @@ -From d51955ea93fba1873e9c2b86a911e114787bdd4d Mon Sep 17 00:00:00 2001 +From fa627c973b378a630b52b0e21fd4d743056ff659 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d51955ea93fba1873e9c2b86a911e114787bdd4d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f0714a5c18..7b5e590bac 100644 +index 1c4226da65..69b63bceba 100644 @@ -23,3 +24,3 @@ -@@ -279,4 +279,5 @@ test_reorder_drain(void) - } - rte_pktmbuf_free(robufs[0]); +@@ -271,4 +271,5 @@ test_reorder_drain(void) + if (robufs[0] != NULL) + rte_pktmbuf_free(robufs[0]); @@ -29,2 +30,2 @@ -@@ -314,4 +315,5 @@ test_reorder_drain(void) - rte_pktmbuf_free(robufs[i]); +@@ -307,4 +308,5 @@ test_reorder_drain(void) + rte_pktmbuf_free(robufs[i]);