bugCFI

Signed-off-by: hewanglon <hewanglong@huawei.com>
Change-Id: Ie42c0ac4327be55589b6093ed22bd6543cee0e11

frameworks/js/napi/BUILD.gn

@@ -28,6 +28,11 @@ config("devicestatus_callback_config") {
 
 ohos_shared_library("stationary") {
   branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
   sources = [
     "${device_status_frameworks_path}/js/napi/src/devicestatus_event.cpp",
     "${device_status_frameworks_path}/js/napi/src/devicestatus_napi.cpp",

frameworks/js/napi/interaction/cooperate/BUILD.gn

@@ -14,6 +14,12 @@
 import("//base/msdp/device_status/device_status.gni")
 
 ohos_shared_library("inputdevicecooperate") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/js_cooperate_context.cpp",
     "src/js_cooperate_manager.cpp",

frameworks/js/napi/interaction/coordination/BUILD.gn

@@ -14,6 +14,12 @@
 import("../../../../../device_status.gni")
 
 ohos_shared_library("cooperate") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/js_coordination_context.cpp",
     "src/js_coordination_manager.cpp",

frameworks/js/napi/interaction/drag/BUILD.gn

@@ -14,6 +14,12 @@
 import("../../../../../device_status.gni")
 
 ohos_shared_library("draginteraction") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/js_drag_context.cpp",
     "src/js_drag_manager.cpp",

frameworks/native/src/BUILD.gn

@@ -24,7 +24,11 @@ config("devicestatusnapi_private_config") {
 
 ohos_shared_library("deviceagent") {
   branch_protector_ret = "pac_ret"
-
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
   sources = [ "./devicestatus_agent.cpp" ]
 
   configs = [

interfaces/innerkits/BUILD.gn

@@ -33,6 +33,12 @@ config("devicestatus_public_config") {
 }
 
 ohos_shared_library("devicestatus_client") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   version_script = "libdevicestatus_client_map"
   sources = [
     "${device_status_frameworks_path}/native/interaction/src/drag_manager_impl.cpp",

libs/BUILD.gn

@@ -27,6 +27,12 @@ config("devicestatus_srv_public_config") {
 }
 
 ohos_shared_library("devicestatus_mock") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/devicestatus_data_parse.cpp",
     "src/devicestatus_msdp_mock.cpp",
@@ -55,6 +61,11 @@ ohos_shared_library("devicestatus_mock") {
 
 ohos_shared_library("devicestatus_algo") {
   branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
   sources = [
     "src/algorithm/algo_absolute_still.cpp",
     "src/algorithm/algo_base.cpp",

rust/data/binding/BUILD.gn

@@ -30,6 +30,12 @@ config("fusion_data_binding_public_config") {
 }
 
 ohos_shared_library("fusion_data_binding") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [ "src/fusion_data_binding.cpp" ]
 
   deps = [ "${device_status_root_path}/utils/common:devicestatus_util" ]

rust/services/binding/BUILD.gn

@@ -27,6 +27,12 @@ config("fusion_services_binding_public_config") {
 }
 
 ohos_shared_library("fusion_services_binding") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [ "src/fusion_services_binding.cpp" ]
 
   deps = [

rust/subsystem/binding/BUILD.gn

@@ -27,6 +27,12 @@ config("fusion_subsystem_binding_public_config") {
 }
 
 ohos_shared_library("fusion_subsystem_binding") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [ "multimedia/src/fusion_image_framework.cpp" ]
 
   deps = [ "${device_status_root_path}/utils/common:devicestatus_util" ]

services/BUILD.gn

@@ -79,6 +79,12 @@ external_deps_set = [
 ]
 
 ohos_shared_library("devicestatus_service") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   shlib_type = "sa"
   include_dirs = [ "//third_party/cJSON" ]
 
@@ -123,6 +129,12 @@ ohos_shared_library("devicestatus_service") {
 }
 
 ohos_static_library("devicestatus_static_service") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   include_dirs = [ "//third_party/cJSON" ]
 
   sources = sources_set

services/interaction/coordination/BUILD.gn

@@ -18,6 +18,12 @@ config("coordination_public_config") {
 }
 
 ohos_shared_library("coordination") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   include_dirs = [
     "include",
     "${device_status_interfaces_path}/innerkits/interaction/include",

services/interaction/drag/BUILD.gn

@@ -18,6 +18,12 @@ config("interaction_drag_public_config") {
 }
 
 ohos_shared_library("interaction_drag") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   include_dirs = [
     "include",
     "${device_status_interfaces_path}/innerkits/interaction/include",

services/native/src/devicestatus_service.cpp

@@ -84,7 +84,7 @@ void DeviceStatusService::OnStart()
         return;
     }
 #ifndef OHOS_BUILD_ENABLE_RUST_IMPL
-    if (!Publish(DelayedSpSingleton<DeviceStatusService>::GetInstance())) {
+    if (!Publish(this)) {
         FI_HILOGE("On start register to system ability manager failed");
         return;
     }
@@ -167,8 +167,7 @@ bool DeviceStatusService::Init()
     CALL_DEBUG_ENTER;
     if (devicestatusManager_ == nullptr) {
         FI_HILOGW("devicestatusManager_ is nullptr");
-        auto ms = DelayedSpSingleton<DeviceStatusService>::GetInstance();
-        devicestatusManager_ = std::make_shared<DeviceStatusManager>(ms);
+        devicestatusManager_ = std::make_shared<DeviceStatusManager>(this);
     }
     if (!devicestatusManager_->Init()) {
         FI_HILOGE("OnStart init failed");

tools/vdev/BUILD.gn

@@ -25,6 +25,12 @@ config("devicestatus_vdev_public_config") {
 }
 
 ohos_source_set("devicestatus_vdev") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/v_input_device.cpp",
     "src/virtual_device.cpp",
@@ -62,6 +68,12 @@ config("devicestatus_vdev_builders_public_config") {
 }
 
 ohos_source_set("devicestatus_vdev_builders") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/virtual_device_builder.cpp",
     "src/virtual_keyboard_builder.cpp",
@@ -90,6 +102,12 @@ ohos_source_set("devicestatus_vdev_builders") {
 }
 
 ohos_executable("vdevadm") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   include_dirs = [
     "include",
     "//third_party/json/include",

utils/common/BUILD.gn

@@ -28,6 +28,12 @@ config("devicestatus_util_public_config") {
 }
 
 ohos_shared_library("devicestatus_util") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   version_script = "libdevicestatus_util_map"
   sources = [
     "src/util.cpp",

utils/ipc/BUILD.gn

@@ -22,6 +22,12 @@ config("devicestatus_ipc_public_config") {
 }
 
 ohos_shared_library("devicestatus_ipc") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = true
+  }
+
   sources = [
     "src/circle_stream_buffer.cpp",
     "src/net_packet.cpp",