diff mbox series

[hurd,commited,4/4] chk: Add and fix hidden builtin definitions for *_chk

Message ID 20230803204827.1193126-5-samuel.thibault@ens-lyon.org
State Committed
Commit 04bf7d2d8a79bf8d06ca811518688ccda190b376
Headers
Series i686-gnu fixes against fortification |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
redhat-pt-bot/TryBot-32bit fail Patch series failed to apply
linaro-tcwg-bot/tcwg_glibc_check--master-arm warning Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 warning Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 warning Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_build--master-arm warning Patch failed to apply

Commit Message

Samuel Thibault Aug. 3, 2023, 8:48 p.m. UTC 
  Otherwise on gnu-i686 there are unwanted PLT entries in libc.so when
fortification is enabled.

Tested for i686-gnu, x86_64-gnu, i686-linux-gnu and x86_64-linux-gnu
---
 debug/longjmp_chk.c | 1 +
 debug/strncpy_chk.c | 1 +
 include/setjmp.h    | 8 ++++++++
 include/stdlib.h    | 2 ++
 include/string.h    | 1 +
 setjmp/longjmp.c    | 2 ++
 6 files changed, 15 insertions(+)

Comments

Sam James Aug. 6, 2023, 5:56 p.m. UTC | #1 
Samuel Thibault <samuel.thibault@ens-lyon.org> writes:

> Otherwise on gnu-i686 there are unwanted PLT entries in libc.so when
> fortification is enabled.
>
> Tested for i686-gnu, x86_64-gnu, i686-linux-gnu and x86_64-linux-gnu

Can this one be backported or not because it somewhat affects ABI?

(Not sure if it falls within what we consider stable or not.)

(Will need 41d8c3bc33bcae1ebb8077b0442caef4917f763a too if we do backport.)
diff mbox series

Patch

diff --git a/debug/longjmp_chk.c b/debug/longjmp_chk.c
index 1bc33c5769..c527e22db6 100644
--- a/debug/longjmp_chk.c
+++ b/debug/longjmp_chk.c
@@ -21,3 +21,4 @@ 
 #define __libc_siglongjmp __longjmp_chk
 
 #include <setjmp/longjmp.c>
+libc_hidden_def (__longjmp_chk)
diff --git a/debug/strncpy_chk.c b/debug/strncpy_chk.c
index cb142b820f..966df2739b 100644
--- a/debug/strncpy_chk.c
+++ b/debug/strncpy_chk.c
@@ -27,3 +27,4 @@  __strncpy_chk (char *s1, const char *s2, size_t n, size_t s1len)
 
   return strncpy (s1, s2, n);
 }
+libc_hidden_builtin_def (__strncpy_chk)
diff --git a/include/setjmp.h b/include/setjmp.h
index 26c6775d08..d2353be71b 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -11,6 +11,14 @@  extern void __longjmp (__jmp_buf __env, int __val)
 extern void ____longjmp_chk (__jmp_buf __env, int __val)
      __attribute__ ((__noreturn__)) attribute_hidden;
 
+extern void __longjmp_chk (sigjmp_buf env, int val)
+	  __attribute__ ((noreturn)) attribute_hidden;
+/* The redirection in the installed header does not work with
+   libc_hidden_proto.  */
+#define longjmp __longjmp_chk
+#define siglongjmp __longjmp_chk
+libc_hidden_proto (__longjmp_chk)
+
 /* Internal function to possibly save the current mask of blocked signals
    in ENV, and always set the flag saying whether or not it was saved.
    This is used by the machine-dependent definition of `__sigsetjmp'.
diff --git a/include/stdlib.h b/include/stdlib.h
index 7deb8193d7..d1d00c0f6f 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -59,6 +59,8 @@  libc_hidden_proto (__isoc23_strtoull_l)
    libc_hidden_proto.  */
 # undef strtol
 # define strtol __isoc23_strtol
+# undef atoi
+# define atoi(nptr) __isoc23_strtol(nptr, NULL, 10)
 # undef strtoul
 # define strtoul __isoc23_strtoul
 # undef strtoll
diff --git a/include/string.h b/include/string.h
index 659530d1aa..86d1fa4abe 100644
--- a/include/string.h
+++ b/include/string.h
@@ -214,6 +214,7 @@  libc_hidden_builtin_proto (__memmove_chk)
 libc_hidden_builtin_proto (__mempcpy_chk)
 libc_hidden_builtin_proto (__memset_chk)
 libc_hidden_builtin_proto (__stpcpy_chk)
+libc_hidden_builtin_proto (__strncpy_chk)
 
 #endif
 
diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c
index 69f540ea22..24795ecbb5 100644
--- a/setjmp/longjmp.c
+++ b/setjmp/longjmp.c
@@ -19,6 +19,8 @@ 
 #include <setjmpP.h>
 #include <signal.h>
 
+#undef longjmp
+#undef siglongjmp
 
 /* Set the signal mask to the one specified in ENV, and jump
    to the position specified in ENV, causing the setjmp