From nobody Tue Feb 10 11:12:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=trmm.net ARC-Seal: i=1; a=rsa-sha256; t=1600357310; cv=none; d=zohomail.com; s=zohoarc; b=k8pduMNuEINl2NMOZ/N3PYg/Z0QApC0ck656wKMqkkAC12Fgcpft3Uemcik27VkluHjmm/pLgdl6LnR+DwXTY9JRlo6fMG3EDGnWjxe9tbgYVMJihKEq5wjKQ79t8Lbfa+MpzIWkKJBi2OuvI5xCYa8nFZuV+QjdnLRU2qGLCbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600357310; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fuqhvq9DYz+DJ+JlySpwZeaHQNhMvXmL/Y74/85/p/A=; b=Go3uI5yrauQy+2zOqu3NSo8te0GoNOy7y5GxhyAeUCyzjHWTpWeNvvy8xCrTvbJW2ULHMkCdb5zARxywGrxe2iiM1fwY50dXwtu588sZPNPgAqbpcF+rrn1abo71VdMgYfqm8OBpLVI/M+lXC3dEBOQB6GVPYAe+tW7VggyhjDc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1600357310820350.4202406423599; Thu, 17 Sep 2020 08:41:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kIw2E-0003UY-Ig; Thu, 17 Sep 2020 15:41:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kIw2C-0003UO-T2 for xen-devel@lists.xenproject.org; Thu, 17 Sep 2020 15:41:20 +0000 Received: from mx1a.swcp.com (unknown [216.184.2.64]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 234a3bb9-a91a-4af2-9c36-024649d30201; Thu, 17 Sep 2020 15:41:18 +0000 (UTC) Received: from ame7.swcp.com (ame7.swcp.com [216.184.2.70]) by mx1a.swcp.com (8.14.4/8.14.4/Debian-4) with ESMTP id 08HFfG42024951 for ; Thu, 17 Sep 2020 09:41:16 -0600 Received: from diamond.fritz.box (62-251-112-184.ip.xs4all.nl [62.251.112.184]) by ame7.swcp.com (8.15.2/8.15.2) with ESMTP id 08HFesRN024558 for ; Thu, 17 Sep 2020 09:41:14 -0600 (MDT) (envelope-from hudson@trmm.net) X-Inumbo-ID: 234a3bb9-a91a-4af2-9c36-024649d30201 Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: neutral (ame7.swcp.com: 62.251.112.184 is neither permitted nor denied by domain of hudson@trmm.net) receiver=ame7.swcp.com; client-ip=62.251.112.184; helo=diamond.fritz.box; envelope-from=hudson@trmm.net; x-software=spfmilter 2.001 http://www.acme.com/software/spfmilter/ with libspf2-1.2.10; X-Authentication-Warning: ame7.swcp.com: Host 62-251-112-184.ip.xs4all.nl [62.251.112.184] claimed to be diamond.fritz.box From: Trammell Hudson To: xen-devel@lists.xenproject.org Subject: [PATCH v5 2/5] efi/boot.c: add file.need_to_free Date: Thu, 17 Sep 2020 11:40:45 -0400 Message-Id: <20200917154048.1140580-3-hudson@trmm.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917154048.1140580-1-hudson@trmm.net> References: <20200917154048.1140580-1-hudson@trmm.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.83 X-Greylist: Message whitelisted by DRAC access database, not delayed by milter-greylist-4.6.2 (ame7.swcp.com [216.184.2.128]); Thu, 17 Sep 2020 09:41:15 -0600 (MDT) X-Virus-Scanned: clamav-milter 0.100.2 at ame7 X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on ame7.swcp.com X-Spam-Status: No, hits=0.7 tests=NO_RECEIVED,NO_RELAYS,SPF_NEUTRAL version=3.4.2 X-Spam-Level: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" The config file, kernel, initrd, etc should only be freed if they are allocated with the UEFI allocator. Signed-off-by: Trammell Hudson --- xen/common/efi/boot.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 157fe0e8c5..77530a0595 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -102,6 +102,7 @@ union string { =20 struct file { UINTN size; + bool need_to_free; union { EFI_PHYSICAL_ADDRESS addr; char *str; @@ -280,13 +281,13 @@ void __init noreturn blexit(const CHAR16 *str) if ( !efi_bs ) efi_arch_halt(); =20 - if ( cfg.addr ) + if ( cfg.addr && cfg.need_to_free ) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - if ( kernel.addr ) + if ( kernel.addr && kernel.need_to_free ) efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); - if ( ramdisk.addr ) + if ( ramdisk.addr && ramdisk.need_to_free ) efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size)); - if ( xsm.addr ) + if ( xsm.addr && xsm.need_to_free ) efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); =20 efi_arch_blexit(); @@ -573,6 +574,7 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle= , CHAR16 *name, HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); ret =3D efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(size), &file->addr); + file->need_to_free =3D true; } if ( EFI_ERROR(ret) ) { --=20 2.25.1