From 7d1f0a159bbf4ec7908d4ff24e670b183914f996 Mon Sep 17 00:00:00 2001
From: gaoqiang_strong <gaoqiang64@huawei-partners.com>
Date: Thu, 5 Jun 2025 12:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80cfi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gaoqiang_strong <gaoqiang64@huawei-partners.com>
---
 interfaces/inner_kits/native_cpp/BUILD.gn                 | 3 ---
 radar/BUILD.gn                                            | 4 ++--
 .../implementation/src/device_manager_service_impl.cpp    | 8 --------
 services/softbuscache/BUILD.gn                            | 1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn
index 34f648786..2068a5585 100644
--- a/interfaces/inner_kits/native_cpp/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/BUILD.gn
@@ -156,9 +156,6 @@ if (defined(ohos_lite)) {
       boundary_sanitize = true
       integer_overflow = true
       ubsan = true
-      cfi = true
-      cfi_cross_dso = true
-      debug = false
     }
 
     cflags = [
diff --git a/radar/BUILD.gn b/radar/BUILD.gn
index 49dc533a0..1a5793e7a 100644
--- a/radar/BUILD.gn
+++ b/radar/BUILD.gn
@@ -68,7 +68,7 @@ if (defined(ohos_lite)) {
       "${innerkits_path}/native_cpp/include",
       "${json_path}/include",
     ]
-    branch_protector_ret = "pac_ret"
+
     sanitize = {
       cfi = true
       cfi_cross_dso = true
@@ -125,7 +125,7 @@ if (defined(ohos_lite)) {
       "${innerkits_path}/native_cpp/include",
       "${json_path}/include",
     ]
-    branch_protector_ret = "pac_ret"
+
     sanitize = {
       cfi = true
       cfi_cross_dso = true
diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp
index f76e29201..a054c1bc3 100644
--- a/services/implementation/src/device_manager_service_impl.cpp
+++ b/services/implementation/src/device_manager_service_impl.cpp
@@ -278,10 +278,6 @@ void DeviceManagerServiceImpl::ImportAuthCodeToConfig(std::shared_ptr<AuthManage
 int32_t DeviceManagerServiceImpl::InitNewProtocolAuthMgr(bool isSrcSide, uint64_t tokenId, uint64_t logicalSessionId,
     const std::string &pkgName)
 {
-    if (pkgName.empty()) {
-        LOGE("pkgName is empty");
-        return ERR_DM_INPUT_PARA_INVALID;
-    }
     LOGI("isSrcSide:%{public}d, tokenId: %{public}" PRIu64 ", logicalSesId: %{public}" PRIu64 ", pkgname:%{public}s",
         isSrcSide, tokenId, logicalSessionId, pkgName.c_str());
     std::shared_ptr<AuthManagerBase> authMgr = nullptr;
@@ -310,10 +306,6 @@ int32_t DeviceManagerServiceImpl::InitNewProtocolAuthMgr(bool isSrcSide, uint64_
 
 int32_t DeviceManagerServiceImpl::InitOldProtocolAuthMgr(uint64_t tokenId, const std::string &pkgName)
 {
-    if (pkgName.empty()) {
-        LOGE("pkgName is empty");
-        return ERR_DM_INPUT_PARA_INVALID;
-    }
     LOGI("tokenId: %{public}" PRIu64 ", pkgname:%{public}s", tokenId, pkgName.c_str());
     if (authMgr_ == nullptr) {
         CreateGlobalClassicalAuthMgr();
diff --git a/services/softbuscache/BUILD.gn b/services/softbuscache/BUILD.gn
index 304974efe..49a243c36 100644
--- a/services/softbuscache/BUILD.gn
+++ b/services/softbuscache/BUILD.gn
@@ -50,7 +50,6 @@ if (defined(ohos_lite)) {
   }
 } else {
   ohos_shared_library("dmdevicecache") {
-    branch_protector_ret = "pac_ret"
     sanitize = {
       boundary_sanitize = true
       cfi = true
-- 
Gitee