From nobody Fri Nov 14 18:17:37 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1760170608; cv=none; d=zohomail.com; s=zohoarc; b=kAomkwef6L+yuf/pvVcF3xX60TRY9NxEHz45+ofgqfdaSui+n8v5sIVxTc2m7fkfhjqWNHeQzSo9Ux5dmWRXa0xpxLbGRfI+pcqmzvdiJAQe6DhWHHPUUpwtI0+F+fJI5n3RwpeW06KNNJ7RPb34vYOI5C+ixehTKbfNSsad2sk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760170608; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fV7UHztEaQ52d1YYUmIY50MBEuXXcFsbhfQR43l1bTY=; b=K0KHxj2QwXMzC3FcsyofI9oYuP+Sqqa8/loTqyhwJY9KLzhrr3e2k/T9Dibv5Y/niH/H9Lo1c5FfmlMHQs1sCE0ZclNGNnW+7/qNsOeyu4vl281pT8vrhgoClgTfWZ23btH/gOSoWEsJqRHQWsuW67cTTa6P277CA+3R+clp3IY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760170608352845.0785165064156; Sat, 11 Oct 2025 01:16:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Um7-0000xg-0W; Sat, 11 Oct 2025 04:16:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v7Um2-0000m9-Q0 for qemu-devel@nongnu.org; Sat, 11 Oct 2025 04:16:18 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7Ulz-00073x-2n for qemu-devel@nongnu.org; Sat, 11 Oct 2025 04:16:18 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3f2cf786abeso2371757f8f.3 for ; Sat, 11 Oct 2025 01:16:13 -0700 (PDT) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-426ce5cfe69sm8045969f8f.32.2025.10.11.01.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Oct 2025 01:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760170568; x=1760775368; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fV7UHztEaQ52d1YYUmIY50MBEuXXcFsbhfQR43l1bTY=; b=gELl514YyGJImWeYO2LE2aG9O/20bYLQiyUE9T+tKHDyhlWJyeILP1S+meJTum+NrB nNwZedSgix8kQ3BDEZomrajbMvnLSahzUvh1FSqRc3qCqU3M7UEbqkeTorlFDp04rvak qfuIm1jplo0Ai1G83msVSmw316yR4l52ad4zIhpZZ6C/gbMJMeoc8Pgo+o88rSPZMjhk h1NgVCt3P/aEaQlCQu4gOiq1YhV7XDmsOeIKfVpG875pNJkojoCHI+0az48eCuD5XrhL Na+Nn1VXCdp0HFcnZCPBhd50t98OT5OJIv3zMHcswpWX8cxpnLtWJd1uxpfM6JqkHpT9 QeWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760170568; x=1760775368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fV7UHztEaQ52d1YYUmIY50MBEuXXcFsbhfQR43l1bTY=; b=C1E3FeJj5XZv+Cd0SCjFmtE7Uf6owoWjd7NA5f3xUyQ1TtUnWTy/4nBJ+D691WLzsj cV87ASSgzEeq3yH5mqb2DAoLafvN8hSRdIloETMiuarX1xbquXkoiSWcqkiLhdL0Zsfm q1t/YT6AMd2LkFoOWtzLd3MfmTxLa/iaz2RvEiY2zUPDi9G8nA8E5eMWGMwOoMlNwGV8 hZm2PW71iA0srC4LmKp7uiKimsdrSzubumALAMJkIWrWaGdQXKR7Nmx45YI+GacEz0L4 wW8AID6cmmljmyLy8T34PVfr3zYZkSD6k/Cp2fKayYrdB5LAWZOauLMhMqTs3+BmALA9 Mkhw== X-Gm-Message-State: AOJu0Yxf/0od8hkU11wdASRWO9Csh5YI5+sN0EzXeWlzE/USBl4nuzmq Q7PUM5rRHTYrR6873dqFeya9x5SFJ6z8NaN8CXP59dnE8qBVVIhzrOSLnNkbO6R7 X-Gm-Gg: ASbGncuMZWdB0482BuxFiBcejZeS/AafyHrwaNd4vCVavcBfgYKGYv5Z67BgJMS81L+ VGvLPOjHrC6yF61cZzVAKGpSA2ptGOTDafYTN0bnlpomeZLRwD7y6gGmrV82yj6uniRrnCI/LU4 M6/jNngk0Dz3iC3VVN3bx7jEYGkvZIm7HETRuwIbx8NkowdmI9crrqfrXHBhr4HNLjflqlHQ3QU c5sku5YXt3zfslQNOd/nMkduwqhqkV0yUBF+4GtfQ5jfX46j0XauewkvDzcTAJKJtGBqU4LrOVl dQAPSV7z4SurNdqpyqh+kUCdC8ySgdt3yhT5AVmE6dOVjQcEg/3K528svGYjbWKLaZVX2rmqx04 BJUbK97GlA+jDzDpnA2sCRNv1YbellKe7EoaV9kidYcf3KjbF5QQOmfoL5Tq/bmqwHQTaFvx+pV RTqrZjV2+BUBMc/ngaIMHM X-Google-Smtp-Source: AGHT+IFfPDCGIphgQQHt7KvrBKUsa8M/6KEmFk1IUQDmhopIRjWGk/bv3Erauh+DwYc3gvhfiOlgjQ== X-Received: by 2002:a05:6000:26c2:b0:3ce:bf23:3c32 with SMTP id ffacd0b85a97d-4266e7beb06mr9399672f8f.22.1760170568272; Sat, 11 Oct 2025 01:16:08 -0700 (PDT) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Daan De Meyer Subject: [PATCH v3 1/3] Rename LOAD_IMAGE_MAX_GUNZIP_BYTES to LOAD_IMAGE_MAX_DECOMPRESSED_BYTES Date: Sat, 11 Oct 2025 10:15:51 +0200 Message-ID: <20251011081553.4065883-2-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251011081553.4065883-1-daan.j.demeyer@gmail.com> References: <20251011081553.4065883-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1760170610659154100 Content-Type: text/plain; charset="utf-8" Preparation for adding support for zstd compressed efi zboot kernel images. Signed-off-by: Daan De Meyer Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/arm/boot.c | 2 +- hw/core/loader.c | 8 ++++---- hw/nvram/fw_cfg.c | 2 +- include/hw/loader.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e77d8679d8..c0dec0343a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -826,7 +826,7 @@ static uint64_t load_aarch64_image(const char *filename= , hwaddr mem_base, ssize_t size; =20 /* On aarch64, it's the bootloader's job to uncompress the kernel. */ - size =3D load_image_gzipped_buffer(filename, LOAD_IMAGE_MAX_GUNZIP_BYT= ES, + size =3D load_image_gzipped_buffer(filename, LOAD_IMAGE_MAX_DECOMPRESS= ED_BYTES, &buffer); =20 if (size < 0) { diff --git a/hw/core/loader.c b/hw/core/loader.c index 477661a025..42edcf2d98 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -796,8 +796,8 @@ ssize_t load_image_gzipped_buffer(const char *filename,= uint64_t max_sz, goto out; } =20 - if (max_sz > LOAD_IMAGE_MAX_GUNZIP_BYTES) { - max_sz =3D LOAD_IMAGE_MAX_GUNZIP_BYTES; + if (max_sz > LOAD_IMAGE_MAX_DECOMPRESSED_BYTES) { + max_sz =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; } =20 data =3D g_malloc(max_sz); @@ -898,8 +898,8 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_= t *size) return -1; } =20 - data =3D g_malloc(LOAD_IMAGE_MAX_GUNZIP_BYTES); - bytes =3D gunzip(data, LOAD_IMAGE_MAX_GUNZIP_BYTES, *buffer + ploff, p= lsize); + data =3D g_malloc(LOAD_IMAGE_MAX_DECOMPRESSED_BYTES); + bytes =3D gunzip(data, LOAD_IMAGE_MAX_DECOMPRESSED_BYTES, *buffer + pl= off, plsize); if (bytes < 0) { fprintf(stderr, "failed to decompress EFI zboot image\n"); g_free(data); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index aa24050493..af3b112524 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1115,7 +1115,7 @@ void load_image_to_fw_cfg(FWCfgState *fw_cfg, uint16_= t size_key, =20 if (try_decompress) { size =3D load_image_gzipped_buffer(image_name, - LOAD_IMAGE_MAX_GUNZIP_BYTES, &dat= a); + LOAD_IMAGE_MAX_DECOMPRESSED_BYTES= , &data); } =20 if (size =3D=3D (size_t)-1) { diff --git a/include/hw/loader.h b/include/hw/loader.h index c96b5e141c..24b91ba02b 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -80,7 +80,7 @@ ssize_t load_image_mr(const char *filename, MemoryRegion = *mr); * load_image_gzipped_buffer() will read. It prevents * g_malloc() in those functions from allocating a huge amount of memory. */ -#define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 << 20) +#define LOAD_IMAGE_MAX_DECOMPRESSED_BYTES (256 << 20) =20 ssize_t load_image_gzipped_buffer(const char *filename, uint64_t max_sz, uint8_t **buffer); --=20 2.51.0 From nobody Fri Nov 14 18:17:37 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1760170613; cv=none; d=zohomail.com; s=zohoarc; b=Mu9kQ2/5sIEyxij5CX0lQuHBVV9T+45aZrqdPJ01Zel3yTyBPlqhottV9QjQ/8moHfaDqW03eScKQ0WX4xZ6aTFaE7VZOD6FBE+VOeaASSksgMIiJCJ0aQE0flsIEkEKla4H2IcBw9viNQ41Ah9ROdujoeQ9MJT0TlEZm0wMHMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760170613; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2FBnfhHMUFYNDwVvtl5qN7dApjjvakN4F4owV5DUAVs=; b=IGQMZ2qbgeuLm2Er/ToemGhTsNhuQlVmiNErAx3pDaKHJTy0k58dvspsX+vhEfUOW7uuELADIU4xLcapwk26r+AG68P0H3pLoxrKNiBYQM1U1IOdwJjFcEfz93SwIMt5FFRW7ss1b4f6NMbivX5oJoPrD99lsY9KQzHMC8cL6AQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760170613129198.30328085158442; Sat, 11 Oct 2025 01:16:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7UmA-00010Q-QU; Sat, 11 Oct 2025 04:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v7Um6-0000xr-3z for qemu-devel@nongnu.org; Sat, 11 Oct 2025 04:16:22 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7Ulw-000743-TV for qemu-devel@nongnu.org; Sat, 11 Oct 2025 04:16:21 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3f1aff41e7eso2009846f8f.0 for ; Sat, 11 Oct 2025 01:16:12 -0700 (PDT) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-426ce5cfe69sm8045969f8f.32.2025.10.11.01.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Oct 2025 01:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760170569; x=1760775369; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2FBnfhHMUFYNDwVvtl5qN7dApjjvakN4F4owV5DUAVs=; b=hlatoyDUMDOwVAKI5FK4AI5nVy3Ova/aI+PzRpFedKMO/x1b7LLssNSB8qyv6Dpv9A 9AzJtlmRyqNdDMHidZ0cSkY3IyumARkHpHC6H/5ArKvVzBqpYidFkUt5Lbi5x03C45Tg 2EzDZG0CGR408j1jKuDNarl1kvTOqHT65UYTkbyW/lNjOKZfZFFzp5LxUG/dyP5zCS7P YDr6uKvAXZ7z87fj6A0pG/TDLxxOj7ZJ6JWwofllPF94j0+Jcl+VUIm71TkVi0U1YdZq 6LLuwPSHsWF5zqw9mXqMxNw+UWnJETkE7vIlQNbjIjFTr968WdKKRHDezFo1Lg+ei+Nb mkNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760170569; x=1760775369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2FBnfhHMUFYNDwVvtl5qN7dApjjvakN4F4owV5DUAVs=; b=e5AEI4WClHsdwUv4toDrtyav+wtXhTn6WlnyoFuiSQyGStgjxdGJk5z7yQYoJ5lNuX WLdnUny3tml7jj2EwNtgdEHXn9dwKWHRBtkfUkzoAYctBaBngLa4fxGngm2aTtBPhmdF OXUSPJWAqftR1LWibrpIX5+Bi/QZye+UWmoWwRuzDncLyNb0rSLLx2dlWez823JfhtfQ 2fOFXu7k1aEsIP/7I1Pf3H3JXU5yrVtvrkeqIBE6nTJWTkK4/YcKgsTZn+ACenish6vA lhMgUVsyo5VwC5zCHe+5uZRrKyVZapG7e72H+k8QoNpJQPxY3F+zpUCHjUdiVzk/iDXf /OOw== X-Gm-Message-State: AOJu0YxnkczAJzTHleZ//Z6p3vKQ0KeuZCP/3K+5SnnA/WVWQJNMi6w+ 5bHGZZ7CmvIMIE5C9wlvayAhD6Nc+Vspfs1xJPx5Ip/e9HMG90H8T9ixmXVGyd6z X-Gm-Gg: ASbGncvdoCxgtpWtYAIbhK5g2I4TixPZhJ/MrEz8WeNIz4+Rrhs1sO29y3vD0mBBi2o QS2hHJAO6/3jd1eqOcDUYYhFBxBPVY1Wox2dDt5ObNT4e553ap5KLllYMKePtQStpehA4ImVrng vaUu9ayaK6LxeGYvQkx5zSb7myNoBIw25T3RdYIbnLsnk8ro7rtYZt5K+WvbtuhTZPIo5vcbUH5 WaI/C3DhrGcTdGNPULwVSJBjPyn3yTcToaeajP1ch6G5CAQKITKhT/JxnWaAIYEC+XU1zBlDOlb R56nF6alwTiOkATaVRB+55IAio/q9YW5Km+8Fq8NS9xMyHOlPNMvHqy+Ln4u3kOVe/90m715WTY bFff1WgMU0+YnqMUW3wUWeL4xTWAEAB08lIa71lQ4oq8DffYaugGnMwqHZyP/Gpcava/IHjJNee j69K8fUbvg3giT4kQPKPgE X-Google-Smtp-Source: AGHT+IELU9OZMbXEHwlJT+37YBD7d7K7WDVpJF6yK5bSFT4OhxbUOpNm+eiGSP2KBdgsjPRcoaVt2w== X-Received: by 2002:a05:6000:26cc:b0:425:8134:706 with SMTP id ffacd0b85a97d-42667177f6emr9710173f8f.16.1760170569231; Sat, 11 Oct 2025 01:16:09 -0700 (PDT) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Daan De Meyer Subject: [PATCH v3 2/3] Use g_autofree in unpack_efi_zboot_image() Date: Sat, 11 Oct 2025 10:15:52 +0200 Message-ID: <20251011081553.4065883-3-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251011081553.4065883-1-daan.j.demeyer@gmail.com> References: <20251011081553.4065883-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1760170614765154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daan De Meyer Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 42edcf2d98..a511888aa3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -864,7 +864,7 @@ struct linux_efi_zboot_header { ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_t *size) { const struct linux_efi_zboot_header *header; - uint8_t *data =3D NULL; + g_autofree uint8_t *data =3D NULL; ssize_t ploff, plsize; ssize_t bytes; =20 @@ -902,12 +902,11 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssiz= e_t *size) bytes =3D gunzip(data, LOAD_IMAGE_MAX_DECOMPRESSED_BYTES, *buffer + pl= off, plsize); if (bytes < 0) { fprintf(stderr, "failed to decompress EFI zboot image\n"); - g_free(data); return -1; } =20 g_free(*buffer); - *buffer =3D g_realloc(data, bytes); + *buffer =3D g_realloc(g_steal_pointer(&data), bytes); *size =3D bytes; return bytes; } --=20 2.51.0 From nobody Fri Nov 14 18:17:37 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1760170618; cv=none; d=zohomail.com; s=zohoarc; b=bbIoVycSx1x1FeiWJ66MLXrdWgj1Eux/KZklhxBH0AjPaVn9qdau5WuQEF4R20MeimIxCkO0MxnGnns9uvt8NhEZ5NNVi2zvdsRVPc87Ll+FJUZIZDfIlTeGyZgx6XxVAhdQAzDsk9nrAW/vuJkKpU1Tya/3GIEEUeU/1GLMLrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760170618; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JEUGtlbTEDbu3NHjc292VovKsiI3/ov/Nge0SM2dTw8=; b=W+E4XWcVb3WbfYaSYGv4EIEIbOBfZ6hUhKtYP6f8cUC4qB169b4FT24gCRRHnDu0aA8DTfxGOnLtqAF46qklLF/B/nrf8djT7OIq6nfLF1Z+defvF+k1YFmFkrI4h2hxE99dBZJ+XM5+cKBsq+OivxEgn13nS/S1TG1KLx8Vp+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760170618333951.8720785132125; Sat, 11 Oct 2025 01:16:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7UmA-00010N-Q6; Sat, 11 Oct 2025 04:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v7Um5-0000wf-5f for qemu-devel@nongnu.org; Sat, 11 Oct 2025 04:16:21 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7Um0-00074E-4U for qemu-devel@nongnu.org; Sat, 11 Oct 2025 04:16:20 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e6674caa5so14104095e9.0 for ; Sat, 11 Oct 2025 01:16:13 -0700 (PDT) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-426ce5cfe69sm8045969f8f.32.2025.10.11.01.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Oct 2025 01:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760170570; x=1760775370; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JEUGtlbTEDbu3NHjc292VovKsiI3/ov/Nge0SM2dTw8=; b=EMBOLux0eVulDUO1wDpaDwrflkAFZW1UXkrY67Wwq3ED91RsaMOluGuffO6oFd63g+ peafTVyui/rz6x+KPK5twGh5+PNLSsn/fQOs8F/PRTDn/7iPsKEJ6f3dt4O6Yv9McOHu wTpwMpWTacyUCAyxQo4UnBXc9KukMIQLYmpbQUTB9VuzTsuHe/pVL4JzhaxFMoXxYFIC ETnpTkDYDc12z07ovQeKS/amHka/wZRPQN7vAtJ5k2ZI2Ggh7hryQDhJbbcfbWPASqT8 2OzrTy8nKVRUgnyY3r4ul7sVYdTlgA2cdYhhLu6pqUu+d5oXIqVkfQ7ZtvE1pGjuP1qU d2aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760170570; x=1760775370; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JEUGtlbTEDbu3NHjc292VovKsiI3/ov/Nge0SM2dTw8=; b=h1mFcsC2846AzoitR5mkI7bulSz1jFNp5v/nE27TCEgHAE5Mp6Vna0KG11++JuAdyc pCVwNAlnKOaHCJ86xP2QDZLQHF7kbUQnJG1aaxaRXABEohqvCpyL9QMChWCd9eGWJDi7 9UhmP5Zh41SC7W7CeD2feiXMKJxCTjlP9f79bO9to1u8vVkZHlJ/lxqU/yXOwRaz3PMf 2rewLtmv+8D4pI7B47KqTCjhbykIm2WQDdYmzWyszPyVgGtbGRfKgFILnV6LwHetEIGo oqAnDeN2U5z+XbqJbwGSRawgH+6oz45r6phfshc/2c5ouhUdpBMP29Uo/ILmhvMkSNXP W70g== X-Gm-Message-State: AOJu0YxCtPyfv6ARJ00JxbLbeESVQUZKw2FzBu0xb29mwz5KUQ0HH3Pd C/B4jYlsJqD9MBTqwZPJCVbe9dYmUJ/f7yeeDxWygmKG/3yUHixHcqobH95JoxMm X-Gm-Gg: ASbGncvVmENlgoj2g8EIw3AaYWSYZUme/0ttMqFpeZrWlLML+xg+cJvA40hAzoJy3Wp mVhVQv2wshKCyspX+EjtnR8JfpYTA/VY8jyDuDkf5dYsR9zyWFRPEj52veQWMPRTshaRNWH4+3g CevWrP+K+yMWoCMvdy3j8zC525UnkIuxNAzwa7Cl0nJsf9mLbdA915nVRlIRmMaZ4/nCi+h2UHX bp1zWjI/QBpSOzet3g1vnpEqx29wfxV83bhW9S455C1pUoYPLZl1GAnTBjuOZfxo9dIlLcJFY9M wqFAoJqZM9mpNcLspQo+V8NqXclP8q5x1Oc1Jl3MZPPOrwM5QntBDLv21oQHDxRZjGxw+CSzVB6 Sc4OMTquKYu5GvV6Fgi+ct+SPJwcD5amM40Ce1xDtNJutCzK1pU1rdGmAbxPtjqNbEHPLhxf+j6 BOgDeEqDE2m4Rpug47yccbnjUgHxJCiC4= X-Google-Smtp-Source: AGHT+IGhAf+vb4DFaeZpot7i/HXRvoYGxB6e/skrls5ht5OY8ER2yzoxEVgAuQiQFWp3b19+zV6bLQ== X-Received: by 2002:a05:600c:458b:b0:45d:5c71:769d with SMTP id 5b1f17b1804b1-46fa9e9a2e5mr111812545e9.8.1760170570093; Sat, 11 Oct 2025 01:16:10 -0700 (PDT) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Daan De Meyer Subject: [PATCH v3 3/3] Add support for zboot images compressed with zstd Date: Sat, 11 Oct 2025 10:15:53 +0200 Message-ID: <20251011081553.4065883-4-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251011081553.4065883-1-daan.j.demeyer@gmail.com> References: <20251011081553.4065883-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1760170620818154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daan De Meyer Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/loader.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index a511888aa3..c1611cc960 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -67,6 +67,11 @@ =20 #include =20 +#ifdef CONFIG_ZSTD +#include +#include +#endif + static int roms_loaded; =20 /* return the size or -1 if error */ @@ -882,14 +887,6 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize= _t *size) return 0; } =20 - if (strcmp(header->compression_type, "gzip") !=3D 0) { - fprintf(stderr, - "unable to handle EFI zboot image with \"%.*s\" compressio= n\n", - (int)sizeof(header->compression_type) - 1, - header->compression_type); - return -1; - } - ploff =3D ldl_le_p(&header->payload_offset); plsize =3D ldl_le_p(&header->payload_size); =20 @@ -899,7 +896,22 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize= _t *size) } =20 data =3D g_malloc(LOAD_IMAGE_MAX_DECOMPRESSED_BYTES); - bytes =3D gunzip(data, LOAD_IMAGE_MAX_DECOMPRESSED_BYTES, *buffer + pl= off, plsize); + + if (strcmp(header->compression_type, "gzip") =3D=3D 0) { + bytes =3D gunzip(data, LOAD_IMAGE_MAX_DECOMPRESSED_BYTES, *buffer = + ploff, plsize); +#ifdef CONFIG_ZSTD + } else if (strcmp(header->compression_type, "zstd") =3D=3D 0) { + size_t ret =3D ZSTD_decompress(data, LOAD_IMAGE_MAX_DECOMPRESSED_B= YTES, *buffer + ploff, plsize); + bytes =3D ZSTD_isError(ret) ? -1 : (ssize_t) ret; +#endif + } else { + fprintf(stderr, + "unable to handle EFI zboot image with \"%.*s\" compressio= n\n", + (int)sizeof(header->compression_type) - 1, + header->compression_type); + return -1; + } + if (bytes < 0) { fprintf(stderr, "failed to decompress EFI zboot image\n"); return -1; --=20 2.51.0