From e0c2cb5bbbaa82730879ba1a44c7d6e856d52cc1 Mon Sep 17 00:00:00 2001 From: geshanghua Date: Fri, 20 Oct 2023 10:36:56 +0800 Subject: [PATCH 1/2] Description: Forward and backward opening CFI Feature or Bugfix:Bugfix Binary Source: No Signed-off-by: geshanghua --- adapter/uhdf2/manager/BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/adapter/uhdf2/manager/BUILD.gn b/adapter/uhdf2/manager/BUILD.gn index 658b36fa9..ad65b7d2d 100644 --- a/adapter/uhdf2/manager/BUILD.gn +++ b/adapter/uhdf2/manager/BUILD.gn @@ -19,6 +19,12 @@ hdf_interfaces_path = "./../../../interfaces" hdf_uhdf_path = "./.." ohos_executable("hdf_devmgr") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } defines = [ "__USER__" ] include_dirs = [ "$hdf_framework_path/core/manager/include", -- Gitee From 63eeaeb046366070fe14be88bcb6de3af4c86b12 Mon Sep 17 00:00:00 2001 From: geshanghua Date: Thu, 26 Oct 2023 11:09:09 +0800 Subject: [PATCH 2/2] Description: HDF subsystem adaptation for x86 Feature or Bugfix:Bugfix Binary Source: No Signed-off-by: geshanghua --- interfaces/inner_api/utils/hdf_base.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/inner_api/utils/hdf_base.h b/interfaces/inner_api/utils/hdf_base.h index 2e8405334..74e38178b 100644 --- a/interfaces/inner_api/utils/hdf_base.h +++ b/interfaces/inner_api/utils/hdf_base.h @@ -127,6 +127,8 @@ typedef enum { */ #ifdef __aarch64__ #define HDF_LIBRARY_FULL_PATH(x) "/vendor/lib64/" x ".z.so" +#elif defined(__x86_64__) +#define HDF_LIBRARY_FULL_PATH(x) "/vendor/lib64/" x ".z.so" #else #define HDF_LIBRARY_FULL_PATH(x) "/vendor/lib/" x ".z.so" #endif -- Gitee