Skip to content

[PAC][compiler-rt] Fix init/fini array signing schema #150691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged

[PAC][compiler-rt] Fix init/fini array signing schema #150691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions compiler-rt/lib/builtins/crtbegin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,33 @@ static void __attribute__((used)) __do_init(void) {
}

#ifdef CRT_HAS_INITFINI_ARRAY
#if __has_feature(ptrauth_init_fini)
# if __has_feature(ptrauth_init_fini)
// TODO: use __ptrauth-qualified pointers when they are supported on clang side
#if __has_feature(ptrauth_init_fini_address_discrimination)
# if __has_feature(ptrauth_init_fini_address_discrimination)
__attribute__((section(".init_array"), used)) static void *__init =
ptrauth_sign_constant(&__do_init, ptrauth_key_init_fini_pointer,
ptrauth_blend_discriminator(
&__init, __ptrauth_init_fini_discriminator));
#else
# else
__attribute__((section(".init_array"), used)) static void *__init =
ptrauth_sign_constant(&__do_init, ptrauth_key_init_fini_pointer,
__ptrauth_init_fini_discriminator);
#endif
#else
# endif
# elif __has_feature(ptrauth_calls)
# ifdef __aarch64__
// If ptrauth_init_fini feature is not present, compiler emits raw unsigned
// pointers in .init_array. Use inline assembly to avoid implicit signing of
// __do_init function pointer with ptrauth_calls enabled.
__asm__(".pushsection .init_array,\"aw\",@init_array\n\t"
".xword __do_init\n\t"
".popsection");
# else
# error "ptrauth_calls is only supported for AArch64"
# endif
# else
__attribute__((section(".init_array"),
used)) static void (*__init)(void) = __do_init;
#endif
# endif
#elif defined(__i386__) || defined(__x86_64__)
__asm__(".pushsection .init,\"ax\",@progbits\n\t"
"call __do_init\n\t"
Expand Down Expand Up @@ -125,22 +136,33 @@ static void __attribute__((used)) __do_fini(void) {
}

#ifdef CRT_HAS_INITFINI_ARRAY
#if __has_feature(ptrauth_init_fini)
# if __has_feature(ptrauth_init_fini)
// TODO: use __ptrauth-qualified pointers when they are supported on clang side
#if __has_feature(ptrauth_init_fini_address_discrimination)
# if __has_feature(ptrauth_init_fini_address_discrimination)
__attribute__((section(".fini_array"), used)) static void *__fini =
ptrauth_sign_constant(&__do_fini, ptrauth_key_init_fini_pointer,
ptrauth_blend_discriminator(
&__fini, __ptrauth_init_fini_discriminator));
#else
# else
__attribute__((section(".fini_array"), used)) static void *__fini =
ptrauth_sign_constant(&__do_fini, ptrauth_key_init_fini_pointer,
__ptrauth_init_fini_discriminator);
#endif
#else
# endif
# elif __has_feature(ptrauth_calls)
# ifdef __aarch64__
// If ptrauth_init_fini feature is not present, compiler emits raw unsigned
// pointers in .fini_array. Use inline assembly to avoid implicit signing of
// __do_fini function pointer with ptrauth_calls enabled.
__asm__(".pushsection .fini_array,\"aw\",@fini_array\n\t"
".xword __do_fini\n\t"
".popsection");
# else
# error "ptrauth_calls is only supported for AArch64"
# endif
# else
__attribute__((section(".fini_array"),
used)) static void (*__fini)(void) = __do_fini;
#endif
# endif
#elif defined(__i386__) || defined(__x86_64__)
__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
"call __do_fini\n\t"
Expand Down
Loading