Merge tag 'efi-fixes-for-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel: - avoid a potential crash on the efi_subsys_init() error path - use more appropriate error code for runtime services calls issued after a crash in the firmware occurred - avoid READ_ONCE() for accessing firmware tables that may appear misaligned in memory * tag 'efi-fixes-for-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efi: tpm: Avoid READ_ONCE() for accessing the event log efi: rt-wrapper: Add missing include efi: fix userspace infinite retry read efivars after EFI runtime services page fault efi: fix NULL-deref in init error path

Linus Torvalds committed 3 years ago

Commit 0bf913e2 parents 40d92fc d3f45054 files · +10 −5Browse files

Showing the changes to include/linux (1 of 4 files). Show all

Unified · Split

include/linux/tpm_eventlog.h+2−2

@@ -198,8 +198,8 @@ static __always_inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *ev · 197 unmodified lines
198	198	* The loop below will unmap these fields if the log is larger than
199	199	* one page, so save them here for reference:
200	200	*/
201		− count = READ_ONCE(event->count);
202		− event_type = READ_ONCE(event->event_type);
	201	+ count = event->count;
	202	+ event_type = event->event_type;
203	203
204	204	/* Verify that it's the log header */
205	205	if (event_header->pcr_idx != 0 \|\|