efi/libstub: arm64: Remap relocated image with strict permissions

ardbiesheuvel · ardbiesheuvel · commit 3c60f67b4bd1 · 2023-03-10T14:11:39.000+01:00
After relocating the executable image, use the EFI memory attributes
protocol to remap the code and data regions with the appropriate
permissions.

Signed-off-by: Ard Biesheuvel &lt;ardb@kernel.org&gt;
diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -139,6 +139,7 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
 	*image_addr = *reserve_addr;
 	memcpy((void *)*image_addr, _text, kernel_size);
 	caches_clean_inval_pou(*image_addr, *image_addr + kernel_codesize);
+	efi_remap_image(*image_addr, *reserve_size, kernel_codesize);
 
 	return EFI_SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,`
`139`	`139`	`image_addr = reserve_addr;`
`140`	`140`	`memcpy((void )image_addr, _text, kernel_size);`
`141`	`141`	`caches_clean_inval_pou(image_addr, image_addr + kernel_codesize);`
	`142`	`+ efi_remap_image(image_addr, reserve_size, kernel_codesize);`
`142`	`143`
`143`	`144`	`return EFI_SUCCESS;`
`144`	`145`	`}`