From 8ae178f4a5a6da8a0846671411e6bc3c3ef204cb Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Sat, 17 May 2025 17:15:43 +0200 Subject: [PATCH] local-stack_chk_guard Fix compatibility with binaries that reference __stack_chk_guard TODO: find where these references are coming from. Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name local-stack_chk_guard.diff --- sysdeps/mach/hurd/dl-sysdep.c | 2 ++ sysdeps/mach/hurd/i386/ld.abilist | 1 + sysdeps/mach/hurd/x86_64/ld.abilist | 1 + 3 files changed, 4 insertions(+) diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 0ddb220a4..eb470d20a 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -66,6 +66,8 @@ void *_dl_random attribute_relro = NULL; struct hurd_startup_data *_dl_hurd_data; +uintptr_t __stack_chk_guard attribute_relro; + ElfW(Addr) _dl_sysdep_start (void **start_argptr, diff --git a/sysdeps/mach/hurd/i386/ld.abilist b/sysdeps/mach/hurd/i386/ld.abilist index ebba31f77..bba7078aa 100644 --- a/sysdeps/mach/hurd/i386/ld.abilist +++ b/sysdeps/mach/hurd/i386/ld.abilist @@ -17,3 +17,4 @@ GLIBC_2.2.6 abort F GLIBC_2.3 ___tls_get_addr F GLIBC_2.3 __tls_get_addr F GLIBC_2.34 __rtld_version_placeholder F +GLIBC_2.4 __stack_chk_guard D 0x4 diff --git a/sysdeps/mach/hurd/x86_64/ld.abilist b/sysdeps/mach/hurd/x86_64/ld.abilist index 2297a5f35..65813436f 100644 --- a/sysdeps/mach/hurd/x86_64/ld.abilist +++ b/sysdeps/mach/hurd/x86_64/ld.abilist @@ -8,6 +8,7 @@ GLIBC_2.38 __open64 F GLIBC_2.38 __pread64 F GLIBC_2.38 __read F GLIBC_2.38 __sbrk F +GLIBC_2.38 __stack_chk_guard D 0x8 GLIBC_2.38 __tls_get_addr F GLIBC_2.38 __write F GLIBC_2.38 __writev F -- 2.30.2