From a613452b3d716f601b0d9ab0d44da335a8789a9f Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Mon, 22 Jan 2024 02:59:47 +0000 Subject: [PATCH 1/3] update config/security/security_config.gni. Signed-off-by: liangxinyan123 --- config/security/security_config.gni | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/security/security_config.gni b/config/security/security_config.gni index bdd4d3b498..3f9c0126aa 100644 --- a/config/security/security_config.gni +++ b/config/security/security_config.gni @@ -17,6 +17,7 @@ declare_args() { enable_auto_var_init = false support_stack_protector_ret = false support_branch_protector_pac_ret = false + use_pac_ret = true } using_security_flag = enable_auto_var_init @@ -39,7 +40,8 @@ if (target_cpu == "arm64" && res == 1 && is_ohos && is_standard_system && } # pac_ret is supported in armv8. -if (target_cpu == "arm64" && is_ohos && is_standard_system && !is_mingw) { +if (target_cpu == "arm64" && is_ohos && is_standard_system && !is_mingw && + use_pac_ret) { support_branch_protector_pac_ret = true } -- Gitee From 9bf461aa818245af7d47da19b97467fc1b91f810 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Mon, 22 Jan 2024 03:10:20 +0000 Subject: [PATCH 2/3] update config/security/security_config.gni. Signed-off-by: liangxinyan123 --- config/security/security_config.gni | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/security/security_config.gni b/config/security/security_config.gni index 3f9c0126aa..9eb402b912 100644 --- a/config/security/security_config.gni +++ b/config/security/security_config.gni @@ -40,8 +40,7 @@ if (target_cpu == "arm64" && res == 1 && is_ohos && is_standard_system && } # pac_ret is supported in armv8. -if (target_cpu == "arm64" && is_ohos && is_standard_system && !is_mingw && - use_pac_ret) { +if (target_cpu == "arm64" && is_ohos && is_standard_system && !is_mingw && use_pac_ret) { support_branch_protector_pac_ret = true } -- Gitee From 8da43ef416a0666481d5c42e86f6ef798244763d Mon Sep 17 00:00:00 2001 From: liangxinyan Date: Mon, 22 Jan 2024 11:13:21 +0800 Subject: [PATCH 3/3] IssueNo: https://gitee.com/openharmony/build/issues/I8WHJJ Signed-off-by: liangxinyan --- config/security/security_config.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/security/security_config.gni b/config/security/security_config.gni index 9eb402b912..3f9c0126aa 100644 --- a/config/security/security_config.gni +++ b/config/security/security_config.gni @@ -40,7 +40,8 @@ if (target_cpu == "arm64" && res == 1 && is_ohos && is_standard_system && } # pac_ret is supported in armv8. -if (target_cpu == "arm64" && is_ohos && is_standard_system && !is_mingw && use_pac_ret) { +if (target_cpu == "arm64" && is_ohos && is_standard_system && !is_mingw && + use_pac_ret) { support_branch_protector_pac_ret = true } -- Gitee