From 9c545f74c598ca1e988fbb11338db152baf6142c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 28 Oct 2022 08:36:27 +0300 Subject: [PATCH] boot/arm-trusted-firmware: don't enable SSP by default SSP support requires support in ATF platform code. Not all platforms implement plat_get_stack_protector_canary() hook. The result is build failure: (.text.asm.update_stack_protector_canary+0x4): undefined reference to `plat_get_stack_protector_canary' Commit cf176128ec4 ("boot/arm-trusted-firmware: add SSP option") originally introduces this issue. But then commit ccac9a5bbbd ("boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR") hid the problem by effectively disabling SSP for all platforms. So only after commit 09acc7cbc91f5 ("boot/arm-trusted-firmware: fix SSP support") the issue showed up. Make SSP an opt-in for platform that actually provide the plat_get_stack_protector_canary() hook. Cc: Sergey Matyukevich Cc: Dick Olsson Tested-by: Heiko Thiery Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit f03ae604510bab7f7f7e516db96a6f880dd86688) Signed-off-by: Peter Korsgaard --- boot/arm-trusted-firmware/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index ad87909bbf..ee009ceb57 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -199,7 +199,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP bool "Build with SSP" - default y depends on BR2_TOOLCHAIN_HAS_SSP depends on !BR2_SSP_NONE help