!736 【安全隐私合规】【文件存储】满足最新安全/隐私/韧性：app_file_service 功能适配

Merge pull request !736 from zhangyaomaggie/master

frameworks/js/backup_ext/BUILD.gn

@@ -14,7 +14,8 @@
 import("//build/ohos.gni")
 
 ohos_static_library("backupextensionability_napi_fwk") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

frameworks/native/backup_ext/BUILD.gn

@@ -15,7 +15,8 @@ import("//build/ohos.gni")
 import("//foundation/filemanagement/app_file_service/backup.gni")
 
 ohos_shared_library("backup_extension_ability_native") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

interfaces/api/js/napi/backup_ext/BUILD.gn

@@ -40,7 +40,8 @@ gen_js_obj("backup_extension_ability_abc") {
 # 即，尝试加载/system/lib64/application/backupextensionability.z.so或/system//lib64/application/backupextensionability_napi.z.so
 # 具体请参考//foundation/arkui/napi/module_manager/native_module_manager.cpp
 ohos_shared_library("backupextensionability_napi") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

interfaces/inner_api/native/backup_kit_inner/BUILD.gn

@@ -31,7 +31,8 @@ config("private_config") {
 }
 
 ohos_shared_library("backup_kit_inner") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

interfaces/innerkits/native/BUILD.gn

@@ -33,7 +33,8 @@ config("file_uri_config") {
 }
 
 ohos_shared_library("fileshare_native") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -74,6 +75,14 @@ ohos_shared_library("fileshare_native") {
 }
 
 ohos_shared_library("fileuri_native") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   sources = [
     "../../common/src/common_func.cpp",
     "../../common/src/json_utils.cpp",
@@ -127,6 +136,14 @@ config("remote_file_share_config") {
 }
 
 ohos_shared_library("remote_file_share_native") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   sources = [
     "../../common/src/json_utils.cpp",
     "../../common/src/sandbox_helper.cpp",
@@ -165,6 +182,14 @@ config("sandbox_helper_config") {
 }
 
 ohos_shared_library("sandbox_helper_native") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   sources = [
     "../../common/src/json_utils.cpp",
     "../../common/src/sandbox_helper.cpp",

interfaces/kits/js/BUILD.gn

@@ -16,6 +16,14 @@ import("//foundation/filemanagement/app_file_service/app_file_service.gni")
 import("//foundation/filemanagement/app_file_service/backup.gni")
 
 ohos_shared_library("fileshare") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   include_dirs = [
     ".",
     "../../common/include",
@@ -63,6 +71,14 @@ ohos_shared_library("fileshare") {
 }
 
 ohos_shared_library("fileuri") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   include_dirs = [
     ".",
     "../../common/include",
@@ -104,6 +120,14 @@ ohos_shared_library("fileuri") {
 }
 
 ohos_shared_library("backup") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   relative_install_dir = "module/file"
   subsystem_name = "filemanagement"
   part_name = "app_file_service"

interfaces/kits/ndk/fileshare/src/BUILD.gn

@@ -14,7 +14,8 @@ import("//build/ohos.gni")
 import("//foundation/filemanagement/app_file_service/app_file_service.gni")
 
 ohos_shared_library("ohfileshare") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

services/backup_sa/BUILD.gn

@@ -15,7 +15,8 @@ import("//build/ohos.gni")
 import("//foundation/filemanagement/app_file_service/backup.gni")
 
 ohos_shared_library("backup_sa") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

tests/utils/BUILD.gn

@@ -19,7 +19,8 @@ config("test_util_public_config") {
 }
 
 ohos_static_library("backup_test_utils") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true

tools/backup_tool/BUILD.gn

@@ -15,6 +15,14 @@ import("//build/ohos.gni")
 import("//foundation/filemanagement/app_file_service/backup.gni")
 
 ohos_executable("backup_tool") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    integer_overflow = true
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   include_dirs = []
   deps = []
   defines = []

utils/BUILD.gn

@@ -41,7 +41,8 @@ ohos_rust_static_ffi("backup_cxx_rust") {
 }
 
 ohos_static_library("backup_cxx_cppdeps") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -67,7 +68,8 @@ ohos_static_library("backup_cxx_cppdeps") {
 }
 
 ohos_shared_library("backup_utils") {
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
+
   sanitize = {
     integer_overflow = true
     ubsan = true