Skip to contentSkip to conversation

EFI fixes for v6.1 #1

GIT PULL Merged Ard Biesheuvel 2 participants 2 messages Oct 21, 2022 – Oct 22, 2022 EFI

lore
Share & tools
lore

Ard Biesheuvel

author maintainer
#0 lore raw

The following changes since commit 9abf2313adc1ca1b6180c508c25f22f9395cc780:

Linux 6.1-rc1 (2022-10-16 15:36:24 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-fixes-for-v6.1-1

for you to fetch changes up to 37926f96302d8b6c2bc97990d33e316a3ed6d67f:

efi: runtime: Don't assume virtual mappings are missing if VA == PA == 0 (2022-10-21 11:09:41 +0200)

----------------------------------------------------------------
First batch of EFI fixes for v6.1

- A pair of fixes for the EFI variable store refactor that landed in v6.0
- A couple of fixes for issue that were introduced during the merge window
- Back out some changes related to EFI zboot signing - we'll add a better solution for this during the next cycle

----------------------------------------------------------------
Ard Biesheuvel (6):
efi: libstub: Remove zboot signing from build options
efi: ssdt: Don't free memory if ACPI table was loaded successfully
efi: efivars: Fix variable writes without query_variable_store()
efi: libstub: Give efi_main() asmlinkage qualification
efi: libstub: Fix incorrect payload size in zboot header
efi: runtime: Don't assume virtual mappings are missing if VA == PA == 0

 drivers/firmware/efi/Kconfig                | 22 ----------------------
 drivers/firmware/efi/arm-runtime.c          |  2 +-
 drivers/firmware/efi/efi.c                  |  2 ++
 drivers/firmware/efi/libstub/Makefile.zboot | 29 ++++-------------------------
 drivers/firmware/efi/libstub/fdt.c          |  8 ++++----
 drivers/firmware/efi/libstub/x86-stub.c     |  6 +++---
 drivers/firmware/efi/libstub/zboot.lds      |  3 ++-
 drivers/firmware/efi/riscv-runtime.c        |  2 +-
 drivers/firmware/efi/vars.c                 | 10 +++++-----
 fs/efivarfs/vars.c                          | 16 ----------------
 include/linux/efi.h                         |  3 ---
 11 files changed, 22 insertions(+), 81 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 21 Oct 2022 17:40:45 +0200:

The pull request you sent on Fri, 21 Oct 2022 17:40:45 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-fixes-for-v6.1-1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ec4cf5dbb1887adadba2f7cbe8131facbd27a5d5

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html