patch 'test/reorder: fix double free of drained buffers' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:06:26 CET 2023


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 <vfialko at marvell.com>
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 <vfialko at marvell.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 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 at 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]);



More information about the stable mailing list