From b0c849b61c029cf5b6f034222027f79d091bda52 Mon Sep 17 00:00:00 2001 From: liuhonglin9 Date: Tue, 21 Nov 2023 06:24:14 +0000 Subject: [PATCH] CFI Signed-off-by: liuhonglin9 Change-Id: I6b35195493455425c318d1feb310617876ee7d14 --- adapter/cloud_adapter_example/BUILD.gn | 6 ++++++ .../inner_api/native/cloud_daemon_kit_inner/BUILD.gn | 6 ++++++ .../inner_api/native/cloudsync_kit_inner/BUILD.gn | 12 ++++++++++++ interfaces/kits/js/cloudfilesync/BUILD.gn | 6 ++++++ interfaces/kits/js/cloudsyncmanager/BUILD.gn | 6 ++++++ services/cloudfiledaemon/BUILD.gn | 6 ++++++ services/cloudsyncservice/BUILD.gn | 12 ++++++++++++ services/distributedfiledaemon/BUILD.gn | 12 ++++++++++++ utils/BUILD.gn | 12 ++++++++++++ 9 files changed, 78 insertions(+) diff --git a/adapter/cloud_adapter_example/BUILD.gn b/adapter/cloud_adapter_example/BUILD.gn index 4d2104cd6..d9216bdb6 100644 --- a/adapter/cloud_adapter_example/BUILD.gn +++ b/adapter/cloud_adapter_example/BUILD.gn @@ -20,6 +20,12 @@ config("public_config") { } ohos_shared_library("cloud_adapter") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "${distributedfile_path}/adapter/cloud_adapter_example/src/dk_asset_read_session.cpp", "${distributedfile_path}/adapter/cloud_adapter_example/src/dk_assets_downloader.cpp", diff --git a/interfaces/inner_api/native/cloud_daemon_kit_inner/BUILD.gn b/interfaces/inner_api/native/cloud_daemon_kit_inner/BUILD.gn index 6782e2604..02490350d 100644 --- a/interfaces/inner_api/native/cloud_daemon_kit_inner/BUILD.gn +++ b/interfaces/inner_api/native/cloud_daemon_kit_inner/BUILD.gn @@ -26,6 +26,12 @@ config("private_config") { } ohos_shared_library("cloud_daemon_kit_inner") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "${distributedfile_path}/frameworks/native/cloud_daemon_kit_inner/src/cloud_daemon_manager.cpp", "${distributedfile_path}/frameworks/native/cloud_daemon_kit_inner/src/cloud_daemon_manager_impl.cpp", diff --git a/interfaces/inner_api/native/cloudsync_kit_inner/BUILD.gn b/interfaces/inner_api/native/cloudsync_kit_inner/BUILD.gn index 7b41bce20..81a404a34 100644 --- a/interfaces/inner_api/native/cloudsync_kit_inner/BUILD.gn +++ b/interfaces/inner_api/native/cloudsync_kit_inner/BUILD.gn @@ -29,6 +29,12 @@ config("private_config") { } ohos_shared_library("cloudsync_kit_inner") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "${distributedfile_path}/frameworks/native/cloudsync_kit_inner/src/cloud_download_callback_client.cpp", "${distributedfile_path}/frameworks/native/cloudsync_kit_inner/src/cloud_download_callback_stub.cpp", @@ -72,6 +78,12 @@ ohos_shared_library("cloudsync_kit_inner") { } ohos_shared_library("cloudsync_asset_kit_inner") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "${distributedfile_path}/frameworks/native/cloudsync_kit_inner/src/cloud_download_uri_manager.cpp", "${distributedfile_path}/frameworks/native/cloudsync_kit_inner/src/cloud_sync_asset_manager.cpp", diff --git a/interfaces/kits/js/cloudfilesync/BUILD.gn b/interfaces/kits/js/cloudfilesync/BUILD.gn index 0b7967e53..41fc3e977 100644 --- a/interfaces/kits/js/cloudfilesync/BUILD.gn +++ b/interfaces/kits/js/cloudfilesync/BUILD.gn @@ -15,6 +15,12 @@ import("//build/ohos.gni") import("//foundation/filemanagement/dfs_service/distributedfile.gni") ohos_shared_library("cloudsync") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "cloud_file_cache_napi.cpp", "cloud_file_download_napi.cpp", diff --git a/interfaces/kits/js/cloudsyncmanager/BUILD.gn b/interfaces/kits/js/cloudsyncmanager/BUILD.gn index d48e4b2e4..c3931841c 100644 --- a/interfaces/kits/js/cloudsyncmanager/BUILD.gn +++ b/interfaces/kits/js/cloudsyncmanager/BUILD.gn @@ -15,6 +15,12 @@ import("//build/ohos.gni") import("//foundation/filemanagement/dfs_service/distributedfile.gni") ohos_shared_library("cloudsyncmanager") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "cloud_sync_manager_n_exporter.cpp", "cloud_sync_manager_napi.cpp", diff --git a/services/cloudfiledaemon/BUILD.gn b/services/cloudfiledaemon/BUILD.gn index d9acb770f..c6967956a 100644 --- a/services/cloudfiledaemon/BUILD.gn +++ b/services/cloudfiledaemon/BUILD.gn @@ -15,6 +15,12 @@ import("//build/ohos.gni") import("//foundation/filemanagement/dfs_service/distributedfile.gni") ohos_shared_library("cloudfiledaemon") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } cloud_disk = [ "src/cloud_disk/database_manager.cpp", "src/cloud_disk/file_operations_base.cpp", diff --git a/services/cloudsyncservice/BUILD.gn b/services/cloudsyncservice/BUILD.gn index fe0ae5f3b..72f4e678f 100644 --- a/services/cloudsyncservice/BUILD.gn +++ b/services/cloudsyncservice/BUILD.gn @@ -26,6 +26,12 @@ config("optimize-size") { ] } ohos_shared_library("cloudsync_sa") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } include_dirs = [ "include", "include/data_sync", @@ -173,6 +179,12 @@ ohos_shared_library("cloudsync_sa") { } ohos_static_library("cloudsync_sa_static") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } include_dirs = [ "include", "include/data_sync", diff --git a/services/distributedfiledaemon/BUILD.gn b/services/distributedfiledaemon/BUILD.gn index f86730839..25b8ce5ea 100644 --- a/services/distributedfiledaemon/BUILD.gn +++ b/services/distributedfiledaemon/BUILD.gn @@ -14,6 +14,12 @@ import("//build/ohos.gni") import("//foundation/filemanagement/dfs_service/distributedfile.gni") ohos_shared_library("libdistributedfiledaemon") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } include_dirs = [ "include", "//third_party/json/include", @@ -76,6 +82,12 @@ config("private_config") { } ohos_shared_library("distributed_file_daemon_kit_inner") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "${distributedfile_path}/frameworks/native/distributed_file_inner/src/distributed_file_daemon_manager.cpp", "${distributedfile_path}/frameworks/native/distributed_file_inner/src/distributed_file_daemon_manager_impl.cpp", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 395966f9b..d8d48acdb 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -57,6 +57,12 @@ config("utils_public_config") { } ohos_shared_library("libdistributedfileutils") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } sources = [ "cloud_disk/src/cloud_file_utils.cpp", "dfx/src/xcollie_helper.cpp", @@ -114,6 +120,12 @@ config("dentry_public_config") { } ohos_shared_library("libdistributedfiledentry") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } include_dirs = [ "dentry/include", "log/include", -- Gitee