diff options
| -rw-r--r-- | libdl/libdl.arm.map | 1 | ||||
| -rw-r--r-- | libdl/libdl.arm64.map | 1 | ||||
| -rw-r--r-- | libdl/libdl.map.txt | 1 | ||||
| -rw-r--r-- | libdl/libdl.mips.map | 1 | ||||
| -rw-r--r-- | libdl/libdl.mips64.map | 1 | ||||
| -rw-r--r-- | libdl/libdl.x86.map | 1 | ||||
| -rw-r--r-- | libdl/libdl.x86_64.map | 1 | ||||
| -rw-r--r-- | libdl/libdl_cfi.cpp | 5 | ||||
| -rw-r--r-- | tests/cfi_test.cpp | 3 |
9 files changed, 15 insertions, 0 deletions
diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map index 292bd9711..9fc9d2369 100644 --- a/libdl/libdl.arm.map +++ b/libdl/libdl.arm.map @@ -36,6 +36,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl.arm64.map b/libdl/libdl.arm64.map index 2fe2c7b94..bde6cab38 100644 --- a/libdl/libdl.arm64.map +++ b/libdl/libdl.arm64.map @@ -35,6 +35,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl.map.txt b/libdl/libdl.map.txt index 408d4dcc9..d1f4ab8d1 100644 --- a/libdl/libdl.map.txt +++ b/libdl/libdl.map.txt @@ -35,6 +35,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl.mips.map b/libdl/libdl.mips.map index 2fe2c7b94..bde6cab38 100644 --- a/libdl/libdl.mips.map +++ b/libdl/libdl.mips.map @@ -35,6 +35,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl.mips64.map b/libdl/libdl.mips64.map index 2fe2c7b94..bde6cab38 100644 --- a/libdl/libdl.mips64.map +++ b/libdl/libdl.mips64.map @@ -35,6 +35,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl.x86.map b/libdl/libdl.x86.map index 2fe2c7b94..bde6cab38 100644 --- a/libdl/libdl.x86.map +++ b/libdl/libdl.x86.map @@ -35,6 +35,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl.x86_64.map b/libdl/libdl.x86_64.map index 2fe2c7b94..bde6cab38 100644 --- a/libdl/libdl.x86_64.map +++ b/libdl/libdl.x86_64.map @@ -35,6 +35,7 @@ LIBC_N { LIBC_OMR1 { # future global: + __cfi_shadow_size; # future __cfi_slowpath; # future __cfi_slowpath_diag; # future } LIBC_N; diff --git a/libdl/libdl_cfi.cpp b/libdl/libdl_cfi.cpp index 8458564a8..483364fcf 100644 --- a/libdl/libdl_cfi.cpp +++ b/libdl/libdl_cfi.cpp @@ -38,6 +38,11 @@ extern "C" uintptr_t* __cfi_init(uintptr_t shadow_base) { return &shadow_base_storage.v; } +// Returns the size of the CFI shadow mapping, or 0 if CFI is not (yet) used in this process. +extern "C" size_t __cfi_shadow_size() { + return shadow_base_storage.v != 0 ? CFIShadow::kShadowSize : 0; +} + static uint16_t shadow_load(void* p) { uintptr_t addr = reinterpret_cast<uintptr_t>(p); uintptr_t ofs = CFIShadow::MemToShadowOffset(addr); diff --git a/tests/cfi_test.cpp b/tests/cfi_test.cpp index 5e627a756..088dda603 100644 --- a/tests/cfi_test.cpp +++ b/tests/cfi_test.cpp @@ -26,6 +26,7 @@ extern "C" { void __cfi_slowpath(uint64_t CallSiteTypeId, void* Ptr); void __cfi_slowpath_diag(uint64_t CallSiteTypeId, void* Ptr, void* DiagData); +size_t __cfi_shadow_size(); } static void f() {} @@ -36,6 +37,8 @@ TEST(cfi_test, basic) { handle = dlopen("libcfi-test.so", RTLD_NOW | RTLD_LOCAL); ASSERT_TRUE(handle != nullptr) << dlerror(); + EXPECT_NE(0U, __cfi_shadow_size()); + #define SYM(type, name) auto name = reinterpret_cast<type>(dlsym(handle, #name)) SYM(int (*)(), get_count); SYM(uint64_t(*)(), get_last_type_id); |