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 6D40D4326F for ; Thu, 2 Nov 2023 14:13:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 670E6410E6; Thu, 2 Nov 2023 14:13:20 +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 28AA3402D5 for ; Thu, 2 Nov 2023 14:13:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930798; 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=UGS6iV9b65hoegD5Bt+UG3055b8LuESs57D1ksI4k18=; b=PqiUjaeY5g6WlP3V/wmYToXLaldiNmPb3RhxKBFE5Z2vVgV/4dwnh7Q55UPtk2h+R/2nHH 9SLsL9HiAuFfGTEdVoOxfAUVDKXG/73sFoEsd1VaRL+1l83r90gRNGhgN/Ylargn5dcXXh 7Ym0WaM8qFYkKB+Q7y0y1Wjenh7olOU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-25zRF-OCOt2dkDOyUIcNnQ-1; Thu, 02 Nov 2023 09:13:15 -0400 X-MC-Unique: 25zRF-OCOt2dkDOyUIcNnQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4DA7A82BA82; Thu, 2 Nov 2023 13:13:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 437FE492BFC; Thu, 2 Nov 2023 13:13:14 +0000 (UTC) From: Kevin Traynor To: Srikanth Yalavarthi Cc: David Marchand , dpdk stable Subject: patch 'eal/unix: fix firmware reading with external xz helper' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:08 +0000 Message-ID: <20231102131254.315947-2-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.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 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 Reviewed-by: David Marchand --- 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@dpdk.org