patch 'fbarray: fix metadata dump' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:05:01 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/9a43ba896c3d27adde4b7216cb1e8df7d82f3f19

Thanks.

Kevin

---
>From 9a43ba896c3d27adde4b7216cb1e8df7d82f3f19 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 3 Jan 2023 11:48:48 +0100
Subject: [PATCH] fbarray: fix metadata dump

[ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ]

If the passed fbarray is invalid, its lock was not taken before
releasing.

Fixes: c44d09811b40 ("eal: add shared indexed file-backed array")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 lib/eal/common/eal_common_fbarray.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c
index 3a28a53247..5903474355 100644
--- a/lib/eal/common/eal_common_fbarray.c
+++ b/lib/eal/common/eal_common_fbarray.c
@@ -1486,5 +1486,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)
 	if (fully_validate(arr->name, arr->elt_sz, arr->len)) {
 		fprintf(f, "Invalid file-backed array\n");
-		goto out;
+		return;
 	}
 
@@ -1500,5 +1500,4 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)
 	for (i = 0; i < msk->n_masks; i++)
 		fprintf(f, "msk idx %i: 0x%016" PRIx64 "\n", i, msk->data[i]);
-out:
 	rte_rwlock_read_unlock(&arr->rwlock);
 }
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:24.107159005 +0000
+++ 0010-fbarray-fix-metadata-dump.patch	2023-02-23 14:46:23.711235760 +0000
@@ -1 +1 @@
-From 70eb4069b05c82494155a89eb8d08d8d2f57b059 Mon Sep 17 00:00:00 2001
+From 9a43ba896c3d27adde4b7216cb1e8df7d82f3f19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index f11f87979f..169e66e04b 100644
+index 3a28a53247..5903474355 100644
@@ -21 +22 @@
-@@ -1483,5 +1483,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)
+@@ -1486,5 +1486,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)
@@ -28 +29 @@
-@@ -1497,5 +1497,4 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)
+@@ -1500,5 +1500,4 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)



More information about the stable mailing list