From 217275043ad73f922d07f42e5fc1a4be70183209 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 9 Jul 2017 08:39:17 -0700 Subject: [PATCH] Add __stack_chk_fail_local alias only to libc.so [BZ #21740] commit 524a8ef2ad76af8ac049293d993a1856b0d888fb Author: Nick Alcock Date: Mon Dec 26 10:08:57 2016 +0100 PLT avoidance for __stack_chk_fail [BZ #7065] Add a hidden __stack_chk_fail_local alias to libc.so, and make sure that on targets which use __stack_chk_fail, this does not introduce a local PLT reference into libc.so. unconditionally added strong_alias (__stack_chk_fail, __stack_chk_fail_local) Since libc.a and libc_nonshared.a has debug/stack_chk_fail_local.c, __stack_chk_fail_local alias should be limited to libc.so. Tested on x86-64 with --enable-stack-protector=all and got FAIL: elf/tst-env-setuid FAIL: elf/tst-env-setuid-tunables FAIL: stdlib/tst-secure-getenv which are the same as without this patch. [BZ #21740] * debug/stack_chk_fail.c (__stack_chk_fail_local): Add the alias only if SHARED is defined. --- debug/stack_chk_fail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debug/stack_chk_fail.c b/debug/stack_chk_fail.c index 4f73464..120d269 100644 --- a/debug/stack_chk_fail.c +++ b/debug/stack_chk_fail.c @@ -28,4 +28,8 @@ __stack_chk_fail (void) __fortify_fail ("stack smashing detected"); } +#ifdef SHARED +/* Some targets call __stack_chk_fail_local as a hidden function within + libc.so. */ strong_alias (__stack_chk_fail, __stack_chk_fail_local) +#endif -- 2.9.4