mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 9bb4cbf486
			
		
	
	
		9bb4cbf486
		
	
	
	
	
		
			
			- fix EFI framebuffer earlycon for wide fonts - avoid filling screen_info with garbage if the EFI framebuffer is not available - fix a potential host tool build error due to a symbol clash on x86 - work around a EFI firmware bug regarding the binary format of the TPM final events table - fix a missing memory free by reworking the E820 table sizing routine to not do the allocation in the first place - add CPER parsing for firmware errors -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEnNKg2mrY9zMBdeK7wjcgfpV0+n0FAl7H3HIACgkQwjcgfpV0 +n1pEAgAjJfwDJmBcYhJzjX8WLnXPJiUmUH9d9tF1t3TlhF6c1G8auXU+Fyia4uI ejRNw/N4+SXzM9yL+Z19PKBpQsPzQXgm2r9WTPVN5jTelUUI+jFZCH+pKC+TKRp1 /Tx/XIMifCw18gNXsjj6WJEeAyLoh4tb+6bwn7DlPO5cPrxX49LvPuQNMXybk2yi KimdNKUry1wYpo/WpHqEdFq5//CLAWNkrL9UXlkANvQ6BJNIMI0kRIUC0MVsTMnE BoCkBO93PdvqxOcnV3WTRvSFetb7qA59Jay62jLc26Myqc4t4pgVWojVm6RHLfZg 17btYACxICgF2mNTZYlKemEEqKPpzQ== =mY5f -----END PGP SIGNATURE----- Merge tag 'efi-fixes-for-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent Pull EFI fixes from Ard Biesheuvel: "- fix EFI framebuffer earlycon for wide fonts - avoid filling screen_info with garbage if the EFI framebuffer is not available - fix a potential host tool build error due to a symbol clash on x86 - work around a EFI firmware bug regarding the binary format of the TPM final events table - fix a missing memory free by reworking the E820 table sizing routine to not do the allocation in the first place - add CPER parsing for firmware errors"
		
			
				
	
	
		
			109 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			109 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| /*
 | |
|  * Copyright (C) 2017 Google, Inc.
 | |
|  *     Thiebaud Weksteen <tweek@google.com>
 | |
|  */
 | |
| 
 | |
| #define TPM_MEMREMAP(start, size) early_memremap(start, size)
 | |
| #define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
 | |
| 
 | |
| #include <asm/early_ioremap.h>
 | |
| #include <linux/efi.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/memblock.h>
 | |
| #include <linux/tpm_eventlog.h>
 | |
| 
 | |
| int efi_tpm_final_log_size;
 | |
| EXPORT_SYMBOL(efi_tpm_final_log_size);
 | |
| 
 | |
| static int __init tpm2_calc_event_log_size(void *data, int count, void *size_info)
 | |
| {
 | |
| 	struct tcg_pcr_event2_head *header;
 | |
| 	int event_size, size = 0;
 | |
| 
 | |
| 	while (count > 0) {
 | |
| 		header = data + size;
 | |
| 		event_size = __calc_tpm2_event_size(header, size_info, true);
 | |
| 		if (event_size == 0)
 | |
| 			return -1;
 | |
| 		size += event_size;
 | |
| 		count--;
 | |
| 	}
 | |
| 
 | |
| 	return size;
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Reserve the memory associated with the TPM Event Log configuration table.
 | |
|  */
 | |
| int __init efi_tpm_eventlog_init(void)
 | |
| {
 | |
| 	struct linux_efi_tpm_eventlog *log_tbl;
 | |
| 	struct efi_tcg2_final_events_table *final_tbl;
 | |
| 	int tbl_size;
 | |
| 	int ret = 0;
 | |
| 
 | |
| 	if (efi.tpm_log == EFI_INVALID_TABLE_ADDR) {
 | |
| 		/*
 | |
| 		 * We can't calculate the size of the final events without the
 | |
| 		 * first entry in the TPM log, so bail here.
 | |
| 		 */
 | |
| 		return 0;
 | |
| 	}
 | |
| 
 | |
| 	log_tbl = early_memremap(efi.tpm_log, sizeof(*log_tbl));
 | |
| 	if (!log_tbl) {
 | |
| 		pr_err("Failed to map TPM Event Log table @ 0x%lx\n",
 | |
| 		       efi.tpm_log);
 | |
| 		efi.tpm_log = EFI_INVALID_TABLE_ADDR;
 | |
| 		return -ENOMEM;
 | |
| 	}
 | |
| 
 | |
| 	tbl_size = sizeof(*log_tbl) + log_tbl->size;
 | |
| 	memblock_reserve(efi.tpm_log, tbl_size);
 | |
| 
 | |
| 	if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR ||
 | |
| 	    log_tbl->version != EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) {
 | |
| 		pr_warn(FW_BUG "TPM Final Events table missing or invalid\n");
 | |
| 		goto out;
 | |
| 	}
 | |
| 
 | |
| 	final_tbl = early_memremap(efi.tpm_final_log, sizeof(*final_tbl));
 | |
| 
 | |
| 	if (!final_tbl) {
 | |
| 		pr_err("Failed to map TPM Final Event Log table @ 0x%lx\n",
 | |
| 		       efi.tpm_final_log);
 | |
| 		efi.tpm_final_log = EFI_INVALID_TABLE_ADDR;
 | |
| 		ret = -ENOMEM;
 | |
| 		goto out;
 | |
| 	}
 | |
| 
 | |
| 	tbl_size = 0;
 | |
| 	if (final_tbl->nr_events != 0) {
 | |
| 		void *events = (void *)efi.tpm_final_log
 | |
| 				+ sizeof(final_tbl->version)
 | |
| 				+ sizeof(final_tbl->nr_events);
 | |
| 
 | |
| 		tbl_size = tpm2_calc_event_log_size(events,
 | |
| 						    final_tbl->nr_events,
 | |
| 						    log_tbl->log);
 | |
| 	}
 | |
| 
 | |
| 	if (tbl_size < 0) {
 | |
| 		pr_err(FW_BUG "Failed to parse event in TPM Final Events Log\n");
 | |
| 		ret = -EINVAL;
 | |
| 		goto out_calc;
 | |
| 	}
 | |
| 
 | |
| 	memblock_reserve((unsigned long)final_tbl,
 | |
| 			 tbl_size + sizeof(*final_tbl));
 | |
| 	efi_tpm_final_log_size = tbl_size;
 | |
| 
 | |
| out_calc:
 | |
| 	early_memunmap(final_tbl, sizeof(*final_tbl));
 | |
| out:
 | |
| 	early_memunmap(log_tbl, sizeof(*log_tbl));
 | |
| 	return ret;
 | |
| }
 | |
| 
 |