From 27dae2140748f2961d23439652db691ce43612d9 Mon Sep 17 00:00:00 2001 From: GUO Zihua Date: Fri, 26 Aug 2022 15:24:20 +0800 Subject: [PATCH 1/2] rk3568: Enable LTO ohos inclusion category: feature feature: Clang CFI issue: I5P4FB CVE: NA Signed-off-by: GUO Zihua -------------------------------- Enable Clang LTO configs, prepare for Clang CFI. Change-Id: I3fd648f67eee81cdb43de98258a0a668d7b4b863 --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index ec3536f..6f3fe39 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -638,6 +638,9 @@ CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_LTO=y +CONFIG_LTO_CLANG=y +CONFIG_LTO_CLANG_THIN=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -- Gitee From ae3c8d7ba6ef893ecefba4e52060bd5356fefe28 Mon Sep 17 00:00:00 2001 From: GUO Zihua Date: Fri, 26 Aug 2022 16:25:55 +0800 Subject: [PATCH 2/2] rk3568: Enable CFI ohos inclusion category: feature feature: Clang CFI issue: I5P4FB CVE: NA Signed-off-by: GUO Zihua -------------------------------- Enable CFI related configs Change-Id: I256ee1684cf4de36887768163f68414642c07e67 --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 6f3fe39..0ed246b 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -641,6 +641,8 @@ CONFIG_STACKPROTECTOR_STRONG=y CONFIG_LTO=y CONFIG_LTO_CLANG=y CONFIG_LTO_CLANG_THIN=y +CONFIG_CFI_CLANG=y +CONFIG_CFI_CLANG_SHADOW=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -- Gitee