diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp
index 2cbc9cdb0ec4b4692c54a32eaabfaaf6c4ec5b58..33fe6cfec57fbb5c61e437da082647668ec42c61 100644
--- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp
+++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp
@@ -75,10 +75,11 @@ void DCameraSinkHandlerTest::TearDown(void)
 void DCameraSinkHandlerTest::SetTokenID()
 {
     uint64_t tokenId;
-    int32_t numberOfPermissions = 2;
+    int32_t numberOfPermissions = 3;
     const char *perms[numberOfPermissions];
-    perms[0] = "ohos.permission.DISTRIBUTED_DATASYNC";
-    perms[1] = "ohos.permission.CAMERA";
+    perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE";
+    perms[1] = "ohos.permission.DISTRIBUTED_DATASYNC";
+    perms[2] = "ohos.permission.CAMERA";
     NativeTokenInfoParams infoInstance = {
         .dcapsNum = 0,
         .permsNum = numberOfPermissions,
diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
index 69e52120a342335f94e85e6c5e90180e72bfaacb..c5f6df6aa2de56f6e302ecee0e18e727bc8aad0f 100644
--- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
@@ -50,6 +50,11 @@ config("module_private_config") {
 }
 
 ohos_unittest("DCameraClientTest") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   module_out_path = module_out_path
 
   sources = [ "dcamera_client_test.cpp" ]
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp
index 4bd68300d0c072246156560cce982dda9cfaa96f..527475947a0c6b1f785bbd3c1b07272223dfa50e 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp
@@ -61,10 +61,11 @@ void DcameraSinkStubTest::TearDown(void)
 void DcameraSinkStubTest::SetTokenID()
 {
     uint64_t tokenId;
-    int32_t numberOfPermissions = 2;
+    int32_t numberOfPermissions = 3;
     const char *perms[numberOfPermissions];
-    perms[0] = "ohos.permission.DISTRIBUTED_DATASYNC";
-    perms[1] = "ohos.permission.CAMERA";
+    perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE";
+    perms[1] = "ohos.permission.DISTRIBUTED_DATASYNC";
+    perms[2] = "ohos.permission.CAMERA";
     NativeTokenInfoParams infoInstance = {
         .dcapsNum = 0,
         .permsNum = numberOfPermissions,
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
index 6164edae6d054f3566e71a7570a25ecda7c8bf33..377a395b8993e3d0122f2ffa5158588de2e78149 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
@@ -56,6 +56,11 @@ config("module_private_config") {
 }
 
 ohos_unittest("DCameraSinkMgrTest") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   module_out_path = module_out_path
 
   sources = [
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp
index 20b26feee1a5db1467ccbe9a8cda7f77f6bd7137..672d6484334708fe929abefd8b081d22b5995aab 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp
@@ -245,7 +245,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_005, TestSize.L
     cmdMetadata.Unmarshal(TEST_METADATA_SETTING_CMD_JSON);
     ret = controller_->UpdateSettings(cmdMetadata.value_);
     controller_->OnMetadataResult(cmdMetadata.value_);
-    EXPECT_EQ(DCAMERA_OK, ret);
+    EXPECT_EQ(DCAMERA_WRONG_STATE, ret);
 }
 
 /**
@@ -359,7 +359,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_012, TestSize.L
     DCameraOpenInfoCmd cmd;
     cmd.Unmarshal(TEST_OPEN_INFO_CMD_JSON);
     int32_t ret = controller_->OpenChannel(cmd.value_);
-    EXPECT_EQ(DCAMERA_OK, ret);
+    EXPECT_EQ(DCAMERA_WRONG_STATE, ret);
 }
 
 /**
@@ -414,7 +414,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_015, TestSize.L
     cmdMetadata.Unmarshal(TEST_METADATA_SETTING_CMD_JSON);
     g_operatorStr = "test015";
     ret = controller_->UpdateSettings(cmdMetadata.value_);
-    EXPECT_EQ(DCAMERA_BAD_VALUE, ret);
+    EXPECT_EQ(DCAMERA_WRONG_STATE, ret);
 }
 
 /**
@@ -430,7 +430,7 @@ HWTEST_F(DCameraSinkControllerTest, dcamera_sink_controller_test_016, TestSize.L
     cmd.Unmarshal(TEST_OPEN_INFO_CMD_JSON);
     g_channelStr = "test016";
     int32_t ret = controller_->OpenChannel(cmd.value_);
-    EXPECT_EQ(DCAMERA_BAD_VALUE, ret);
+    EXPECT_EQ(DCAMERA_WRONG_STATE, ret);
 }
 
 /**
diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
index a274a9064d1a808e4466feb98c50bb7688ea7608..59bb54d5034df2d2a9eab21f8693a00ee091d666 100644
--- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
+++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
@@ -52,6 +52,11 @@ config("module_private_config") {
 }
 
 ohos_unittest("DCameraSourceTest") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   module_out_path = module_out_path
 
   sources = [
diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
index 458650c260ff164af3298b57e9a99e05c1e01126..d9943f27e8691af795bffe01c690fc551488bd5e 100644
--- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
+++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
@@ -57,6 +57,11 @@ config("module_private_config") {
 }
 
 ohos_unittest("DCameraSourceMgrTest") {
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   module_out_path = module_out_path
 
   sources = [