about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-06 00:00:19 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-06 02:04:32 +0200
commitecfa912f4217c0af277bb5d9cd26155010556baf (patch)
tree9bcd751e740b6fc8fef4a1b96dd0dcb0f3fb887b
parent8dbb7a08ec52057819db4ee234f9429ab99eb4ae (diff)
downloadglibc-ecfa912f4217c0af277bb5d9cd26155010556baf.tar.gz
glibc-ecfa912f4217c0af277bb5d9cd26155010556baf.tar.xz
glibc-ecfa912f4217c0af277bb5d9cd26155010556baf.zip
hurd: Add stack guard support
* sysdeps/mach/hurd/i386/tls.h (THREAD_SET_STACK_GUARD,
THREAD_COPY_STACK_GUARD): New macros
* sysdeps/mach/hurd/i386/ld.abilist (__stack_chk_guard): Remove symbol.
-rw-r--r--sysdeps/mach/hurd/i386/ld.abilist1
-rw-r--r--sysdeps/mach/hurd/i386/tls.h9
2 files changed, 9 insertions, 1 deletions
diff --git a/sysdeps/mach/hurd/i386/ld.abilist b/sysdeps/mach/hurd/i386/ld.abilist
index 6f591b2496..b2be75cbff 100644
--- a/sysdeps/mach/hurd/i386/ld.abilist
+++ b/sysdeps/mach/hurd/i386/ld.abilist
@@ -18,4 +18,3 @@ GLIBC_2.2.6 _r_debug D 0x14
 GLIBC_2.2.6 abort F
 GLIBC_2.3 ___tls_get_addr F
 GLIBC_2.3 __tls_get_addr F
-GLIBC_2.4 __stack_chk_guard D 0x4
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
index 0c2de054d8..03a894bd35 100644
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
@@ -295,6 +295,15 @@ out:
      asm ("movl %%gs:%P1,%0" : "=q" (_dtv) : "i" (offsetof (tcbhead_t, dtv)));\
      _dtv; })
 
+
+/* Set the stack guard field in TCB head.  */
+#define THREAD_SET_STACK_GUARD(value) \
+  THREAD_SETMEM (THREAD_SELF, stack_guard, value)
+#define THREAD_COPY_STACK_GUARD(descr) \
+  ((descr)->stack_guard							      \
+   = THREAD_GETMEM (THREAD_SELF, stack_guard))
+
+
 # include <mach/machine/thread_status.h>
 
 /* Set up TLS in the new thread of a fork child, copying from the original.  */