diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-27 03:22:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-27 03:22:28 +0000 |
| commit | 8548fb9ade271be913773e1b1c1b98f836e24f11 (patch) | |
| tree | 90c76c66869efa0f59929f35f19b1070443cff67 | |
| parent | b37c80a4a25303a7342814cd99cff8e473f8862f (diff) | |
remove non-openbsd.randomdata parts
ok miod matthew
| -rw-r--r-- | lib/libc/sys/stack_protector.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/libc/sys/stack_protector.c b/lib/libc/sys/stack_protector.c index a6b147c1e22..da65b8195f2 100644 --- a/lib/libc/sys/stack_protector.c +++ b/lib/libc/sys/stack_protector.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stack_protector.c,v 1.12 2012/08/24 01:28:54 matthew Exp $ */ +/* $OpenBSD: stack_protector.c,v 1.13 2013/12/27 03:22:27 deraadt Exp $ */ /* * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat. @@ -36,11 +36,7 @@ extern int __sysctl(int *, u_int, void *, size_t *, void *, size_t); -#ifdef __ELF__ long __guard[8] __attribute__((section(".openbsd.randomdata"))); -#else -long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; -#endif static void __guard_setup(void) __attribute__ ((constructor)); void __stack_smash_handler(char func[], int damaged __attribute__((unused))); @@ -55,13 +51,6 @@ __guard_setup(void) if (__guard[i] != 0) return; -#if 0 - { - struct syslog_data sdata = SYSLOG_DATA_INIT; - syslog_r(LOG_WARNING, &sdata, "__guard not initialized"); - } -#endif - mib[0] = CTL_KERN; mib[1] = KERN_ARND; |