Skip to content

Service Indicator: Add error call trampoline to avoid delocator issue #2920

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
jakemas merged 3 commits into from
Jan 14, 2026
+14 −1
Merged

Service Indicator: Add error call trampoline to avoid delocator issue #2920

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1d0cfe
Service Indicator: Add error call trampoline to avoid delocator issue
jakemas Dec 19, 2025
05f899e
Merge branch 'main' into delocate-service-indicator
justsmth Jan 7, 2026
297ac29
Merge branch 'main' into delocate-service-indicator
jakemas Jan 14, 2026
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
15 changes: 14 additions & 1 deletion crypto/fipsmodule/service_indicator/service_indicator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@ int is_fips_build(void) {

#if defined(AWSLC_FIPS)

// Trampoline function to avoid ARM64 ADR range issues in large FIPS module.
// This function is intentionally not inlined to ensure the __FILE__ string
// literal reference stays close to the call site, avoiding the ±1MB PC-relative
// addressing limit of the ARM64 ADR instruction.
#if defined(_MSC_VER)
__declspec(noinline)
Comment on lines +27 to +28
Copy link
Contributor

@justsmth justsmth Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NP: this line is not strictly necessary since the delocator is not used on Windows; but I think it's fine for consistency.

#else
__attribute__((noinline))
#endif
static void put_set_thread_local_error(void) {
OPENSSL_PUT_ERROR(CRYPTO, ERR_R_INTERNAL_ERROR);
}

#define STATE_UNLOCKED 0
#define TLS_MD_EXTENDED_MASTER_SECRET_CONST "extended master secret"
#define TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE 22
Expand Down Expand Up @@ -56,7 +69,7 @@ static struct fips_service_indicator_state *service_indicator_get(void) {

if (!CRYPTO_set_thread_local(
AWSLC_THREAD_LOCAL_FIPS_SERVICE_INDICATOR_STATE, indicator, free)) {
OPENSSL_PUT_ERROR(CRYPTO, ERR_R_INTERNAL_ERROR);
put_set_thread_local_error();
return NULL;
}
}
Expand Down
Loading