summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2023-04-18 15:49:51 +0200
committerArd Biesheuvel <ardb@kernel.org>2023-04-20 15:45:12 +0200
commit538bc0f40b364f2c7b81f11aa163f723b138b40f (patch)
treebf1902edf9c52086c6b67f3e1d6f441a09300b98 /arch/arm64
parentbca2f3a9406b89961fbc6c92c52c6fc1fd91d35f (diff)
efi/zboot: Set forward edge CFI compat header flag if supported
Add some plumbing to the zboot EFI header generation to set the newly introduced DllCharacteristicsEx flag associated with forward edge CFI enforcement instructions (BTI on arm64, IBT on x86) x86 does not currently uses the zboot infrastructure, so let's wire it up only for arm64. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile
index c65aee088410..ae645fda90bc 100644
--- a/arch/arm64/boot/Makefile
+++ b/arch/arm64/boot/Makefile
@@ -42,5 +42,6 @@ $(obj)/Image.zst: $(obj)/Image FORCE
EFI_ZBOOT_PAYLOAD := Image
EFI_ZBOOT_BFD_TARGET := elf64-littleaarch64
EFI_ZBOOT_MACH_TYPE := ARM64
+EFI_ZBOOT_FORWARD_CFI := $(CONFIG_ARM64_BTI_KERNEL)
include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot