diff --git a/interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h b/interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h index 95a7dd127ead3762d381f3806d9b5e9616a2faab..5b61c48f545a577c3ad6c53c9b97f9726bd8ae61 100644 --- a/interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h +++ b/interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h @@ -20,7 +20,6 @@ #include #include "errcode.h" -#include "jit_fort_helper.h" #include "jit_code_signer_base.h" #include "jit_code_signer_factory.h" #include "jit_fort_helper.h" @@ -214,7 +213,7 @@ __attribute__((no_sanitize("cfi"))) static inline int32_t CopyToJitCode( return CS_ERR_JITFORT_IN; } #endif - if (IsSupportPACFeature()) { + if (IsSupportJitCodeSigner()) { ret = signer->ValidateCodeCopy(reinterpret_cast(jitMemory), reinterpret_cast(tmpBuffer), size); } else { diff --git a/interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h b/interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h index 46b33a992ec0f2f0c0fe177864c80d54971a3871..40e704d587a0b2b3d06828362f596ec97c8b70b9 100644 --- a/interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h +++ b/interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h @@ -22,7 +22,6 @@ #ifdef __aarch64__ #include #include -#include #endif #include "errcode.h" @@ -67,7 +66,8 @@ __attribute__((always_inline)) static int inline PrctlWrapper( __attribute__((always_inline)) static inline bool IsSupportPACFeature() { #ifdef __aarch64__ - long hwcaps = PrctlWrapper(JITFORT_PRCTL_OPTION, JITFORT_CPU_FEATURES, 0); + unsigned long hwcaps = static_cast(PrctlWrapper( + JITFORT_PRCTL_OPTION, JITFORT_CPU_FEATURES, 0)); if ((hwcaps & HWCAP_PACA) && (hwcaps & HWCAP_PACG)) { return true; }