From patchwork Thu Sep 17 15:40:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trammell Hudson X-Patchwork-Id: 11782805 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C2AD359D for ; Thu, 17 Sep 2020 15:41:54 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C2832222D for ; Thu, 17 Sep 2020 15:41:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C2832222D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=trmm.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kIw2C-0003UI-Aa; Thu, 17 Sep 2020 15:41:20 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kIw2B-0003Ts-GZ for xen-devel@lists.xenproject.org; Thu, 17 Sep 2020 15:41:19 +0000 X-Inumbo-ID: 982583e6-9090-45cd-a74f-9fe08c7fd87e Received: from mx1a.swcp.com (unknown [216.184.2.64]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 982583e6-9090-45cd-a74f-9fe08c7fd87e; Thu, 17 Sep 2020 15:41:14 +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 08HFfDlw024942 for ; Thu, 17 Sep 2020 09:41:13 -0600 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; 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 08HFesRM024558 for ; Thu, 17 Sep 2020 09:41:10 -0600 (MDT) (envelope-from hudson@trmm.net) 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 1/5] efi/boot.c: Make file->ptr const void* Date: Thu, 17 Sep 2020 11:40:44 -0400 Message-Id: <20200917154048.1140580-2-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 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:11 -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" Other than the config file parser that edits the image inplace, no other users of the file sections requires write access to the data. Signed-off-by: Trammell Hudson Reviewed-by: Jan Beulich --- xen/common/efi/boot.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 0ac80e47bb..157fe0e8c5 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -41,7 +41,7 @@ typedef EFI_STATUS (/* _not_ EFIAPI */ *EFI_SHIM_LOCK_VERIFY) ( - IN VOID *Buffer, + IN const VOID *Buffer, IN UINT32 Size); typedef struct { @@ -104,7 +104,8 @@ struct file { UINTN size; union { EFI_PHYSICAL_ADDRESS addr; - void *ptr; + char *str; + const void *ptr; }; }; @@ -592,7 +593,7 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, efi_arch_handle_module(file, name, options); } - ret = FileHandle->Read(FileHandle, &file->size, file->ptr); + ret = FileHandle->Read(FileHandle, &file->size, file->str); if ( !EFI_ERROR(ret) && file->size != size ) ret = EFI_ABORTED; if ( EFI_ERROR(ret) ) @@ -616,7 +617,7 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, static void __init pre_parse(const struct file *cfg) { - char *ptr = cfg->ptr, *end = ptr + cfg->size; + char *ptr = cfg->str, *end = ptr + cfg->size; bool start = true, comment = false; for ( ; ptr < end; ++ptr ) @@ -645,7 +646,7 @@ static void __init pre_parse(const struct file *cfg) static char *__init get_value(const struct file *cfg, const char *section, const char *item) { - char *ptr = cfg->ptr, *end = ptr + cfg->size; + char *ptr = cfg->str, *end = ptr + cfg->size; size_t slen = section ? strlen(section) : 0, ilen = strlen(item); bool match = !slen;