From nobody Mon Feb 9 06:28:11 2026 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=1763987879; cv=none; d=zohomail.com; s=zohoarc; b=Ny5HUxZ5o/j5gyIYjkqJca5kw2tJV7edv2FmzmTmuEJT5g8Fd1/VmKTfbeI4cL9tPPA8ZwKsZkM1Y5ZvDeiAU33uZ0f8eFElbkdK3jr04maa76DM6PNByhR4x4PGKft6jMxN6BDqpwnaBVXtAxtWOlrzWVDYvOi9+RxaHXU+GUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763987879; h=Content-Type: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=Zo8S7nGNognO0/VxU7MQDCfV+i+r6phHemy20JEw9V4=; b=MJjhdFsgXIOgOIEKrLp8SVme9YU4GlYp98cfinKX4bjvwg3ALLEBkBzbM3SKzCVz9ZC2ElXFLZEK1+H6QMnlFu0c+MaEXt8fOcgYDLIXgAmp7b8POjXW0iGkVuUBGKGalJxMmpHcRqvFuMBtcrBD+imSPFh+lVAydPVZEwH1iZU= 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 1763987879832676.5298559715446; Mon, 24 Nov 2025 04:37:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNVpG-0000mF-6d; Mon, 24 Nov 2025 07:37:50 -0500 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 1vNVnT-0004Zh-1Z for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:36:00 -0500 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 1vNVnO-0007J4-RE for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:35:57 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-42b3377aaf2so2424719f8f.2 for ; Mon, 24 Nov 2025 04:35:37 -0800 (PST) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42cb7fd8c47sm29398449f8f.38.2025.11.24.04.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 04:35:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763987736; x=1764592536; 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=Zo8S7nGNognO0/VxU7MQDCfV+i+r6phHemy20JEw9V4=; b=hl0laNLFx+bnZhjQcsAWocNzLN2Gbm7VozcaaQRekqRsoyM3w5qmvzHuKc1tAawWcT 97TW96Vy+FQyHGUmRe4xJoxLOaGJabgsRmrtXaWSYPt8P2kw8QYHcuVFTQ2JWVe6bxq1 TGMbArDBGW9ckmBh38F1vOAWEC1DV/zLJlzc+r24pQF8qiWM9TyRf0lB45cv2r2XpKNY bQNtaD2iau5TfJRIUcLXHtdEV+oUuhde+ndAY6wQGPnQ3YKTCC4AkIKnucYR5CkTBIec RiSD8Wtpq/wOs3RPuf5sXF7oerOGbCGfPpzEdG5jKIUXp7pOg5SEb/1uyWrQ8UTp44Bv f4RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763987736; x=1764592536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Zo8S7nGNognO0/VxU7MQDCfV+i+r6phHemy20JEw9V4=; b=Oi51f7YXBAPouungMdye/iQajrhLV8D3MYiLM/KzdTMSSnZ9Pxw0InS+W30n/juxZ8 /IryZdxcqEfV5a57suArJaRknC4/8RVjgypPdLwl4Xcb/nnye0Xdp4NBp/OMv3BWxep0 /gSSgdMiScmjFiE7cZSOC5DU6n+p/dFhZlo8HbJxXIdDwhxUdil+/O/D6/J0V+xRWwvp S9Zp5vUinFkymKDjJZ3SSHeTa1HaVvoVADK/Dg1qqBLdEQUeoYJ71WSk5RmA7GwoeWIB cKIJ80GTS5mj1VwouoOr0G3B930w/akATCZwDYF6oxwdESTYf8XaPUm2jpEI14CJgVYR 4gOg== X-Gm-Message-State: AOJu0YwbQAxfnF0gJ/2fk66zUAwMg2s9GEGMTcrnkpFD5kwOrFA1b0lq iMPa/ylwbnL7yU7+pAEfpZZg21Tum+rDUaawJaGO6CoElXNK0iqtlGmbFXFKk7IL X-Gm-Gg: ASbGncuk4MHnRZQL45BTd7NiLP8frYwUB0ZGwtJlUUSVzdd0EX1Fh4TDZgimiwDLUW0 /4cEefwmQnONT+Erpg98aFVd49YktjS5WDA/SpyEdPhgiYF8XcJEo5FtFbu86uamBtz/7qcgC5s gzx+eylWQbbwBKvx9Jj2al+tHmvZYdtd3l7K7AycT6ZzxtQmti6vblH4DHZuPxTtYuiEr2b7GGI zZlw8qyri9vT89Ei6nhoVvhAJdiV3rEead41+AFJ3Q4eqPK/+CBuKg3qnWV60147WHNzcnKvbFi YrQS02q4ar7XvyRVsGp9ixVhxYGdfl35tQ0JVT7BhUQ8veCCzkZNkE64tgmRj3us1ld2dXMNlPH WFeHI38XM3YtHoLOmd8pQ3B7cA9Z+YJ9JD7eQf39GTz3QLV9h/ro2hzV//xlvrX0/aB6zFDL19m JIFmRWMrrH+V4XihAqeVd2Tu99hLNaQFtIfrGyKQpbwJitNXoplG0qACWz3cb1keEytQ== X-Google-Smtp-Source: AGHT+IE5mjXUbXSUZPQGflsVQ11nsrXwNUCOuTNCM4sjec3tFflPiDznw+y9XZKWYlcz/CfBnpkH5w== X-Received: by 2002:a05:6000:1445:b0:42b:5448:7b06 with SMTP id ffacd0b85a97d-42cc1cbce56mr11971189f8f.13.1763987735897; Mon, 24 Nov 2025 04:35:35 -0800 (PST) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Paul Burton , qemu-arm@nongnu.org, Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daan De Meyer , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 1/4] Rename LOAD_IMAGE_MAX_GUNZIP_BYTES to LOAD_IMAGE_MAX_DECOMPRESSED_BYTES Date: Mon, 24 Nov 2025 13:35:18 +0100 Message-ID: <20251124123521.1058183-2-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> References: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, 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: 1763987880266019200 Preparation for adding support for zstd compressed efi zboot kernel images. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daan De Meyer --- hw/arm/boot.c | 4 ++-- hw/core/loader.c | 9 +++++---- hw/nvram/fw_cfg.c | 2 +- include/hw/loader.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index b91660208f..6cf8a4b7fd 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -823,11 +823,11 @@ static uint64_t load_aarch64_image(const char *filena= me, hwaddr mem_base, hwaddr kernel_load_offset =3D KERNEL64_LOAD_ADDR; uint64_t kernel_size =3D 0; uint8_t *buffer; + size_t max_size =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; 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, - &buffer); + size =3D load_image_gzipped_buffer(filename, max_size, &buffer); =20 if (size < 0) { gsize len; diff --git a/hw/core/loader.c b/hw/core/loader.c index 590c5b02aa..f940b6a227 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -814,8 +814,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); @@ -885,6 +885,7 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_= t *size) uint8_t *data =3D NULL; ssize_t ploff, plsize; ssize_t bytes; + size_t max_bytes =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; =20 /* ignore if this is too small to be a EFI zboot image */ if (*size < sizeof(*header)) { @@ -916,8 +917,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(max_bytes); + bytes =3D gunzip(data, max_bytes, *buffer + ploff, 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 d035e72748..3371de506f 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -82,7 +82,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.1 From nobody Mon Feb 9 06:28:11 2026 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=1763987867; cv=none; d=zohomail.com; s=zohoarc; b=OaUat/yLDARgM9nB6JIw6VRoUmLellW7GZarMS1V2Uzo9SQlqYvj5Gq6n0j24rs5hkB54KH7rLIWdBEEmq80HBsxBq409Q6OAvYKDOnlcUBIkuBJrCtnu+b1KTOl+tYCoEYvF+qFoYQDxyOctb/j+9n92o3MSd13FdKMrq6DBCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763987867; 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=GzsfYVjLziv8GqLGvmBW2tkLI+AhZ5hpP3y9tNvFPo4=; b=W5hrNApwyDBF/dFOK6XRi3LkFa+BnXXVMbGAKDAMrAiq40KkUdKDyoMa9Y+eANTypHphzbyg5gE9w7PYEU6Tee3IeYCEfqxxFqohuYhKcJXWxcG05RyMk6W3H12syXxW9lC7+VpsrnsTiYfibBugWJdFUZ/9nE4/LUnXIxV2leg= 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 1763987867846145.6005399103659; Mon, 24 Nov 2025 04:37:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNVp2-0008Rr-Cp; Mon, 24 Nov 2025 07:37:36 -0500 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 1vNVnT-0004Zc-0U for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:36:00 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNVnO-0007JE-RD for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:35:58 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4779d47be12so32843495e9.2 for ; Mon, 24 Nov 2025 04:35:38 -0800 (PST) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42cb7fd8c47sm29398449f8f.38.2025.11.24.04.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 04:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763987737; x=1764592537; 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=GzsfYVjLziv8GqLGvmBW2tkLI+AhZ5hpP3y9tNvFPo4=; b=kTONt8HB+EN7zGR0PjO40HNOGq26ANr8NbL+NDutINLlIYihczugWqyvtvznLwuX8M tCxMdV6TRvRi/1xnkVloMVBUrx3Uu2/ruRtnjM8whjV/piQakP2rAEsShXwePp9rNt9n Z8y8FTFV3aUZNUPrWxV0OKpA0Nbgtwv/UIBwdjbHQgkwGLCbxiCvI8kA9UgEfwQ5piBO 623NMhJIvLRor/iSKCJQpJSqP/c2itKyLUKPFOPYfXziNdVbwoG/kq4FhG4C9ea3eXga R9Lj1XVTw6uCDQ7YEDz0Mc9J60llD0g1A/Y8EHreIsd2ASY/8/iqEGWW1DUPz0PaI+C9 aMGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763987737; x=1764592537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GzsfYVjLziv8GqLGvmBW2tkLI+AhZ5hpP3y9tNvFPo4=; b=LVm0e5Z3Hc1RDFOvfXb69fGeHqW2TDsmE4ofnhwl0ydx6sEdBOWRsp6RbAurjy7lo4 z/4V53SrQldfBG178WPvk+GnXJQKvLnDzBKgDp54jvC+1Gvnm290ndsdl1A4OBo/hhy0 2bV7LoIHCr5l/+CyqzUau317QPBy+/qbGWRPVH4UTgXYHnDHQ9bGsExG7lGDX+V/Fosc 5AlvIyAX23MeUnHzCZ25XxwRFDTkE0yVw61UuPuWXoyTey+hZ+6e/f+YqrFIeSctV3Sq cPZt8B/PB1etFi1M2Yhgnrq5UO7RrlySQIM6IS6CsKexyq0OPuzsEPpTt//nB8/1NTiG xCLQ== X-Gm-Message-State: AOJu0YyW5bwIflGFMBlRiGy84soMmSVLcXrxf9fDeQ67fHmr4JzQ+rjy BcOexk0tcPEleK7QfiagvACPW5RH27MJpRPtel1M6hL+8CH61868FSsz1eiNK1rI X-Gm-Gg: ASbGnctwDg8/0yoNik7zkw+mwhr/FbTCouXu5f16OuiTYwIh/p6mq3V9o+Jw0LbXJ8M TZuFNgKVCHi9gJSjDIZdPlFPn+PFxwO0/n2wmUm7XxLU1UjchJwedkjI4C1TOyr/nNr7YiF/m5o ncQCa3vc2SUwjhvjuoGJCZOP/n4qXoRBVWa0HeDDIIf2MEzXKsRfJvb3eLUIs/sUtZb7NHcqqeb slYerrtKqvdSZNND1OOhlwDHHR5Ac4Dr1QCAics66D1IRYudt1dZb7oww/1271+apRxVPluxcj6 3al08SC+fiFuQXm+O4syHexXxLUA1Npaf62lI/nJiCUjquqb0S+4B5PymkIXjVX44ul1jmTcbJI c7EVzsKRtSiixCerefFg+EF0sZE1hoAkfiZQhrVaUDpfbFCRW61nDczh+8TQVKyKSKYL+OyaYIS V1vUAxE54MpnyDzo0drU+auK6OgXpx1RQZhNDvcWvyjCNG4giXGVgHPB2LR7K0Y3GC6Q== X-Google-Smtp-Source: AGHT+IECsFcAHYR33jFD9mzwfbw4MtaGzS8C7Q4+M0di8doEZj3IJ6rfXGJXfOBVchuLt1wvcHjJHw== X-Received: by 2002:a05:600c:1c02:b0:477:9caa:1a26 with SMTP id 5b1f17b1804b1-477c01eed7cmr117596175e9.29.1763987737333; Mon, 24 Nov 2025 04:35:37 -0800 (PST) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Paul Burton , qemu-arm@nongnu.org, Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daan De Meyer Subject: [PATCH v4 2/4] Rename UBOOT_MAX_GUNZIP_BYTES to UBOOT_MAX_DECOMPRESSED_BYTES Date: Mon, 24 Nov 2025 13:35:19 +0100 Message-ID: <20251124123521.1058183-3-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> References: <20251124123521.1058183-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::32c; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wm1-x32c.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: 1763987868204019200 Content-Type: text/plain; charset="utf-8" For consistency with LOAD_IMAGE_MAX_DECOMPRESSED_BYTES. Signed-off-by: Daan De Meyer Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/loader-fit.c | 2 +- hw/core/loader.c | 2 +- include/hw/loader.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 2dea485ae0..5895e89f22 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -70,7 +70,7 @@ static void *fit_load_image_alloc(const void *itb, const = char *name, } =20 if (!strcmp(comp, "gzip")) { - uncomp_len =3D UBOOT_MAX_GUNZIP_BYTES; + uncomp_len =3D UBOOT_MAX_DECOMPRESSED_BYTES; uncomp_data =3D g_malloc(uncomp_len); =20 uncomp_len =3D gunzip(uncomp_data, uncomp_len, (void *) data, sz); diff --git a/hw/core/loader.c b/hw/core/loader.c index f940b6a227..090af59df2 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -739,7 +739,7 @@ static ssize_t load_uboot_image(const char *filename, h= waddr *ep, ssize_t bytes; =20 compressed_data =3D data; - max_bytes =3D UBOOT_MAX_GUNZIP_BYTES; + max_bytes =3D UBOOT_MAX_DECOMPRESSED_BYTES; data =3D g_malloc(max_bytes); =20 bytes =3D gunzip(data, max_bytes, compressed_data, hdr->ih_size); diff --git a/include/hw/loader.h b/include/hw/loader.h index 3371de506f..cbcb274fce 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -343,7 +343,7 @@ ssize_t rom_add_option(const char *file, int32_t bootin= dex); =20 /* This is the usual maximum in uboot, so if a uImage overflows this, it w= ould * overflow on real hardware too. */ -#define UBOOT_MAX_GUNZIP_BYTES (64 << 20) +#define UBOOT_MAX_DECOMPRESSED_BYTES (64 << 20) =20 typedef struct RomGap { hwaddr base; --=20 2.51.1 From nobody Mon Feb 9 06:28:11 2026 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=1763987971; cv=none; d=zohomail.com; s=zohoarc; b=fnFkmeB8Q8ffhXzyEt7fEatsyw+5HhlInSLao+60YRSVFIHfcu+iEpElXBDoBdm11XfTwRDuLVwuQloOqriQOhvBuythms6tCYrY6CXfG3jR/HVECS2Eiv2uPlnRWSc2ORwvwpeqNlFUCbaPUiIrPnOFghbNklmBgua8wdcTFYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763987971; h=Content-Type: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=3+qEsQEA/CfckaiigN0jZROnstk9a/IX7Pb4PVkmi6U=; b=UwGS7uJJfD7Ol0Y3+YJ6AYstpnqk/C4mZC/iAPYQJO44fKmdEMGUunr2zsjqzMwqc/UtYEFWUdkpj2Xx64jq4W7jdpZEnL6575PzZl5dSjVND3U8B8vDkEKOU9rrwAs7N6gmP9GVz8agKODEsSBC2chqdI6cgWv1K5oECYN5fDw= 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 1763987971295298.03062683928465; Mon, 24 Nov 2025 04:39:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNVpT-0001Tb-6n; Mon, 24 Nov 2025 07:38:03 -0500 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 1vNVnT-0004Zd-0e for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:36:00 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNVnO-0007JO-RF for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:35:57 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-42bb288c1bfso2469648f8f.2 for ; Mon, 24 Nov 2025 04:35:40 -0800 (PST) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42cb7fd8c47sm29398449f8f.38.2025.11.24.04.35.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 04:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763987739; x=1764592539; 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=3+qEsQEA/CfckaiigN0jZROnstk9a/IX7Pb4PVkmi6U=; b=NwqYaveuiTxDdJVVeTmW4qn43q9BnXmTlrMEnETnXyk4G95nS1af2TSsHZb8RJJO6i +7ymlExH8GiV8RcaIdmrSufjxViOLp3poalt3Cfx1ggJPf4AQL9LnSHxfRHQ0Fv4HS/f topFdA/Pc81vn2Ajk87wGxnOYAAaLmrrzrn03jcEoB0LejfR8WTkygP5f/o74mIbnMlQ VeDZ97gT5Gpl7SHi64tQLahT3TpeC6pxs2+pv/9nBHlTZYsH61Vge6PlzJfEU1GOijqX GKptkVtfD8juaq/uYhwXYEaW6cFmiA/P9U96s3iDGnXcCcZL++aFu/PqYbSVWqEFW28n z6Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763987739; x=1764592539; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3+qEsQEA/CfckaiigN0jZROnstk9a/IX7Pb4PVkmi6U=; b=lM4rJ4m5JheWBu6EPMce4aTsV2D4dfU8D1fqOyEkd2soREfVmRIvu1AVzYGP3pOAHE SyKkXySSiAyQeQmMCuxVbOfqjbMsUg+x46RdIZtgXWHI2hKfiNWxm+wzC6Qq8YoWXxMh RRtlaKFqpM0Fr2YxeqN6TfWGmmaHVhgYqCh8xtpUGCmQFzS24zaUdsKVx4jHA4lj+S5a UJ5BayQS1g7QRFbILjMKLzhYZ3gXnHkmV65mtmwRaaWi4/W+2MFTkwTVeOvrvYzXYkLd BZ9/d+FusuJMPCijhzKYuGdwujmPlzLvJFe25vm8ombljwRP/HRRhXpqBEZhPGnbIovQ DYrg== X-Gm-Message-State: AOJu0YyKTt9lLnnkdmaht6Y+1RYlcHqFSiJ2Znugr+E5/DkhRX36YO2V l9RBxqvePTOf3CylvmyYV5LvRzsPHvy5lvrtZBxke9yRHUwWQwtTgRImbvJ4iB4/ X-Gm-Gg: ASbGncs1AUMZH7ZJzdB6CkW7eKTKQ5NeKVoJlq0TjHsq254URb2lM5wx60Sfv5rXpUZ 2CT8XxKD/RHRxvzb1L1EilycqqfMb4DnCGkfwgUSZb6r1pv3EOs+4HRyTqQORv0UNZLCVothqfe COQPu2LQ9QW+dfNsDMj4GBPxB5d5K4/k2Dqkol3IxboS1FH1qG/G4Tkd1gX81+UPvhBvg502etZ 3RU3gR5Jondm+Hlj64eAoizaLkwplzFfwRSGSFRGwpxEufLzDv6tdaxHYmK/tF778d24w3B8e+x Lc4QWAP1RzlMENAoRMjYEsI+8zoWTIkuebTBzM2luqxyz223SfdcAV2uZ2q7THlKaBTngEs9h8w Yfn1EGx+kiIOnJYzxtH3wD5yaN6KP7A5x/bss/EDQyB5MPv9TAz5UO+hhUYRjjsYqsMoi2hftoc B9EovwIMwJJKqymsPu09eHEfVVBqGRd8Dzn/IJ/r3ShUYtE29BxB1WxoPAE8GbDBYP7w== X-Google-Smtp-Source: AGHT+IHZiwZyu+s6uxta//QkEHCbQyEDPEiNPl/7vZStApz9Y6NpEqWa/4eA6g5aQSpWe9AMVj9frg== X-Received: by 2002:a5d:5c84:0:b0:42b:3ab7:b8a4 with SMTP id ffacd0b85a97d-42cc1d0e42cmr12599618f8f.33.1763987738993; Mon, 24 Nov 2025 04:35:38 -0800 (PST) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Paul Burton , qemu-arm@nongnu.org, Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daan De Meyer , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 3/4] Use g_autofree in unpack_efi_zboot_image() Date: Mon, 24 Nov 2025 13:35:20 +0100 Message-ID: <20251124123521.1058183-4-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> References: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::430; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wr1-x430.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: 1763987972779019200 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daan De Meyer --- 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 090af59df2..d74e33ceb6 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -882,7 +882,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; size_t max_bytes =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; @@ -921,12 +921,11 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssiz= e_t *size) bytes =3D gunzip(data, max_bytes, *buffer + ploff, 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.1 From nobody Mon Feb 9 06:28:11 2026 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=1763987971; cv=none; d=zohomail.com; s=zohoarc; b=mOhUnlPr5OLP0BFg/vfmIm4hw8XcynpUoXHOD2gUfcFuXQ/UFkwoIfkUJbytuy5xKhW1k++t6NEotbmQQwKPusoD2DGuR97GjVfPCBJ+Y3V6RCz+bq65BKUe/GuUWIyQDBCZctBvTtEu4HZtcD4vZBaDFuvPPdH4qHp8pbxOsVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763987971; h=Content-Type: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=UJpIBNaZOFuhnrwWjkztkAq8tKp5jAAxKtIuMTnAr+k=; b=gq9z7owEMX8ZdZCBnFBPMdfwuAqzbXqAs4xu4xGlbW2864CT+k5H8lxdJ2XMTqqANfoi5HL2/NAZL1vrRibLo1IbRUxx353WcqHAxPJDR1G3+eK9MmzboSTi8ZuOXxECDGbqRe7d+AqjLFrDeG4DzsQmBr3qvB/su3G3zOvpY9s= 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 1763987971380969.0418670658705; Mon, 24 Nov 2025 04:39:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNVpU-0001VB-CD; Mon, 24 Nov 2025 07:38:04 -0500 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 1vNVnT-0004Zf-1E for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:36:00 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNVnO-0007Jc-Nv for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:35:57 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-42b32a5494dso2238397f8f.2 for ; Mon, 24 Nov 2025 04:35:42 -0800 (PST) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42cb7fd8c47sm29398449f8f.38.2025.11.24.04.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 04:35:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763987741; x=1764592541; 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=UJpIBNaZOFuhnrwWjkztkAq8tKp5jAAxKtIuMTnAr+k=; b=jrvsbgQTxsLfGRnDrTkyJyYBFaily9jiymSB/7G/igrkyubWrdeOKpWBggS2hYmNm2 vV4y0JruNpc08Z/IxAHKxmpEO/mGRJFxz49rV/7xEBmeuGwYjirLnCFJWwcczQRzvc1n lXJdhxEw5FaLev+PM/ZjBKlE2jA1ZHJEsjPypmL6NzDu2Rzlpa/VS/kA3l1CHBBcUaCS owK+12H8JZsee7mh0DqIDtaXpmBR6xCf4qNMe5R3yJ6nefx4DjaAe4EQXgolvKjpByXt 0lvSTEM4/jaen7qpYKJrs83NSaPAZ9AvDIQTPb+j9G/ylC1oexKuGab3E/O+nfXdZtnl uyWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763987741; x=1764592541; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UJpIBNaZOFuhnrwWjkztkAq8tKp5jAAxKtIuMTnAr+k=; b=cMFoP8IfC5nY93fVxA8SAwk/6jUa9mON92QawxrsmFdmJSKnePY4c7Upnh+BGB0B7Y taOTrB6MwVe0ypP+LqIzkkEU5tHUVTgfv5w49zR1DhV8pBMIo5CB1mwpi83eyjjcEJZu XCp2CC49VMQ08PYmgiNTsPRCY5Pwj1XkXjqUcRDOTN6qeJoJU+7Eqj9uKV8OLkAkGNOF 5/YBMLNTsGqmQOLTeTUhzvvna94uo1PwGj/Ya9NEYYElq0QMN2RDfuMX8mVpf8mzm2J8 lbd9FfRaDRgfSQnTQfrDgexwQ8MfTJzvSaXqVOtmhW08hkvF/x00DVKuhaj1QX/SQQmZ z3Jw== X-Gm-Message-State: AOJu0YyCSZsESC4unOfgSrdDgzpa6l7kJwumSWVqOtLTk7aTilUMhp0Q NZy1LblM0t+E5lJR5TUkwIt/gYvAhYQfTZTjzD2b/ncrKryJRKUiTVtF2xizpfK6 X-Gm-Gg: ASbGncuPZaYTOb3xrQEcl/5GbGkIzQc6GMAm/9Qo0aVUHgdBP4z5vx+iFfZFACNfI+e oKRO/L7a5zdwgA2YJdyQ6AhuMZ5zXjq4HivL6YC2yjiWRR39WGCx7Rk82H4UcUm7QKAfp2R7v6U 7/oHFvzfoDOU+egqT0VWfF9ssLGVc/9F452yUnr4mmKIH7H68vuV72TEys3/R49l0wYrZesZcQr lvhWLORmvkvu9R+es8BIGjFRZSNS4hcJ5ltZ4eEoKaXhlc2clLfGCDaotICGMVSn8daBJLnmW/j 10eWFiBcWwdhX5O8Rw0w5dGICEHMQX9sItV0nGnHaak6LC3vUrWyg77yhAXvbc1UMB152LcCOb3 yfHUfAP1jLo1ThyhDEMYhmN+pK4JjVAt0fWkshRZPa6323yMjyQb9IRl4BbQTK9lVwyHw86Iw8X ophb+UqLvbgnRBIVvdZGCXhTWhgI0zzpIOTD/xPYB2DGHO1MY2ZpzGXfm0rTW1afQ0iQ== X-Google-Smtp-Source: AGHT+IHTDRqhAMbKnspIob5GZBMfGzZsXUAPCH2NX/ECmyvAmnkW7Wqwniz8JZ93/vPNfhiHDx75gg== X-Received: by 2002:a05:6000:2601:b0:42b:3da6:6d32 with SMTP id ffacd0b85a97d-42cc1cf3bedmr10859489f8f.23.1763987740731; Mon, 24 Nov 2025 04:35:40 -0800 (PST) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Paul Burton , qemu-arm@nongnu.org, Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daan De Meyer , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 4/4] Add support for zboot images compressed with zstd Date: Mon, 24 Nov 2025 13:35:21 +0100 Message-ID: <20251124123521.1058183-5-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> References: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::42e; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wr1-x42e.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: 1763987972794019200 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daan De Meyer --- 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 d74e33ceb6..8924767e7d 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -68,6 +68,11 @@ =20 #include =20 +#ifdef CONFIG_ZSTD +#include +#include +#endif + static int roms_loaded; =20 /* return the size or -1 if error */ @@ -901,14 +906,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 @@ -918,7 +915,22 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize= _t *size) } =20 data =3D g_malloc(max_bytes); - bytes =3D gunzip(data, max_bytes, *buffer + ploff, plsize); + + if (strcmp(header->compression_type, "gzip") =3D=3D 0) { + bytes =3D gunzip(data, max_bytes, *buffer + ploff, plsize); +#ifdef CONFIG_ZSTD + } else if (strcmp(header->compression_type, "zstd") =3D=3D 0) { + size_t ret =3D ZSTD_decompress(data, max_bytes, *buffer + ploff, p= lsize); + 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.1