patch 'eal/unix: fix firmware reading with external xz helper' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/08/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/c8f024efd852b3826a1cd8faabfa372be638e00d

Thanks.

Kevin

---
>From c8f024efd852b3826a1cd8faabfa372be638e00d Mon Sep 17 00:00:00 2001
From: Srikanth Yalavarthi <syalavarthi at marvell.com>
Date: Tue, 26 Sep 2023 07:44:54 -0700
Subject: [PATCH] eal/unix: fix firmware reading with external xz helper

[ upstream commit 39970abcf4850e070aa4709c87bcac15cb27caf8 ]

libarchive may support xz decompression only through an
external (slower) helper.

In such a case, archive_read_support_filter_xz() returns
ARCHIVE_WARN.

Fixes: 40edb9c0d36b ("eal: handle compressed firmware")

Signed-off-by: Srikanth Yalavarthi <syalavarthi at marvell.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/eal/unix/eal_firmware.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c
index d1616b0bd9..1a7cf8e7b7 100644
--- a/lib/eal/unix/eal_firmware.c
+++ b/lib/eal/unix/eal_firmware.c
@@ -26,17 +26,29 @@ firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize)
 {
 	struct archive_entry *e;
+	int err;
 
 	ctx->a = archive_read_new();
 	if (ctx->a == NULL)
 		return -1;
-	if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK ||
-			archive_read_support_filter_xz(ctx->a) != ARCHIVE_OK ||
-			archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK ||
-			archive_read_next_header(ctx->a, &e) != ARCHIVE_OK) {
-		archive_read_free(ctx->a);
-		ctx->a = NULL;
-		return -1;
-	}
+
+	if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK)
+		goto error;
+
+	err = archive_read_support_filter_xz(ctx->a);
+	if (err != ARCHIVE_OK && err != ARCHIVE_WARN)
+		goto error;
+
+	if (archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK)
+		goto error;
+
+	if (archive_read_next_header(ctx->a, &e) != ARCHIVE_OK)
+		goto error;
+
 	return 0;
+
+error:
+	archive_read_free(ctx->a);
+	ctx->a = NULL;
+	return -1;
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:40.967609150 +0000
+++ 0002-eal-unix-fix-firmware-reading-with-external-xz-helpe.patch	2023-11-02 13:09:40.762163172 +0000
@@ -1 +1 @@
-From 39970abcf4850e070aa4709c87bcac15cb27caf8 Mon Sep 17 00:00:00 2001
+From c8f024efd852b3826a1cd8faabfa372be638e00d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 39970abcf4850e070aa4709c87bcac15cb27caf8 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org