summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArvind Sankar <nivedita@alum.mit.edu>2020-10-11 10:20:12 -0400
committerArd Biesheuvel <ardb@kernel.org>2020-10-26 08:06:36 +0100
commit688eb28211abdf82a3f51e8997f1c8137947227d (patch)
tree23baec172b555cb0efd66668a796440358999715 /drivers
parentbc13809f1c47245cd584f4ad31ad06a5c5f40e54 (diff)
downloadlinux-stable-688eb28211abdf82a3f51e8997f1c8137947227d.tar.gz
linux-stable-688eb28211abdf82a3f51e8997f1c8137947227d.tar.bz2
linux-stable-688eb28211abdf82a3f51e8997f1c8137947227d.zip
efi/x86: Only copy the compressed kernel image in efi_relocate_kernel()
The image_size argument to efi_relocate_kernel() is currently specified as init_size, but this is unnecessarily large. The compressed kernel is much smaller, in fact, its image only extends up to the start of _bss, since at this point, the .bss section is still uninitialized. Depending on compression level, this can reduce the amount of data copied by 4-5x. Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Link: https://lore.kernel.org/r/20201011142012.96493-1-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/efi/libstub/x86-stub.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 3672539cb96e..f14c4ff5839f 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -715,8 +715,11 @@ unsigned long efi_main(efi_handle_t handle,
(IS_ENABLED(CONFIG_X86_32) && buffer_end > KERNEL_IMAGE_SIZE) ||
(IS_ENABLED(CONFIG_X86_64) && buffer_end > MAXMEM_X86_64_4LEVEL) ||
(image_offset == 0)) {
+ extern char _bss[];
+
status = efi_relocate_kernel(&bzimage_addr,
- hdr->init_size, hdr->init_size,
+ (unsigned long)_bss - bzimage_addr,
+ hdr->init_size,
hdr->pref_address,
hdr->kernel_alignment,
LOAD_PHYSICAL_ADDR);