From: Ard Biesheuvel <ardb@xxxxxxxxxx>
This is the stable backport of commit
c00b413a96261fae ("x86/boot: Sanitize boot params before parsing command line")
to the v6.6 and v6.1 trees.
Patch #2 can be applied to both v6.1 and v6.6. Patch #1 is a
prerequisite that is already present in v6.1 but was not backported to
v6.6 yet for reasons that are unclear to me, and so it needs to be
applied to v6.6 first.
Ard Biesheuvel (2):
x86/boot: Rename conflicting 'boot_params' pointer to
'boot_params_ptr'
x86/boot: Sanitize boot params before parsing command line
arch/x86/boot/compressed/acpi.c | 14 +++++------
arch/x86/boot/compressed/cmdline.c | 4 +--
arch/x86/boot/compressed/ident_map_64.c | 7 +++---
arch/x86/boot/compressed/kaslr.c | 26 ++++++++++----------
arch/x86/boot/compressed/mem.c | 6 ++---
arch/x86/boot/compressed/misc.c | 26 ++++++++++----------
arch/x86/boot/compressed/misc.h | 1 -
arch/x86/boot/compressed/pgtable_64.c | 11 +++++----
arch/x86/boot/compressed/sev.c | 2 +-
arch/x86/include/asm/boot.h | 2 ++
drivers/firmware/efi/libstub/x86-stub.c | 2 +-
drivers/firmware/efi/libstub/x86-stub.h | 2 --
12 files changed, 52 insertions(+), 51 deletions(-)
--
2.49.0.rc0.332.g42c0ae87b1-goog
