| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: stack_protector.c,v 1.6 2011/09/16 16:05:59 joerg Exp $ */ | | 1 | /* $NetBSD: stack_protector.c,v 1.7 2011/12/08 02:27:14 joerg Exp $ */ |
2 | /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ | | 2 | /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ |
3 | | | 3 | |
4 | /* | | 4 | /* |
5 | * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat. | | 5 | * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat. |
6 | * All rights reserved. | | 6 | * All rights reserved. |
7 | * | | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | | 8 | * Redistribution and use in source and binary forms, with or without |
9 | * modification, are permitted provided that the following conditions | | 9 | * modification, are permitted provided that the following conditions |
10 | * are met: | | 10 | * are met: |
11 | * 1. Redistributions of source code must retain the above copyright | | 11 | * 1. Redistributions of source code must retain the above copyright |
12 | * notice, this list of conditions and the following disclaimer. | | 12 | * notice, this list of conditions and the following disclaimer. |
13 | * 2. Redistributions in binary form must reproduce the above copyright | | 13 | * 2. Redistributions in binary form must reproduce the above copyright |
14 | * notice, this list of conditions and the following disclaimer in the | | 14 | * notice, this list of conditions and the following disclaimer in the |
| @@ -18,27 +18,27 @@ | | | @@ -18,27 +18,27 @@ |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | | 18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
19 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | | 19 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
20 | * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, | | 20 | * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, |
21 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | | 21 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
22 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | | 22 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
23 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 23 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | | 24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
25 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | | 25 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
26 | * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 26 | * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
27 | * POSSIBILITY OF SUCH DAMAGE. | | 27 | * POSSIBILITY OF SUCH DAMAGE. |
28 | * | | 28 | * |
29 | */ | | 29 | */ |
30 | #include <sys/cdefs.h> | | 30 | #include <sys/cdefs.h> |
31 | __RCSID("$NetBSD: stack_protector.c,v 1.6 2011/09/16 16:05:59 joerg Exp $"); | | 31 | __RCSID("$NetBSD: stack_protector.c,v 1.7 2011/12/08 02:27:14 joerg Exp $"); |
32 | | | 32 | |
33 | #ifdef _LIBC | | 33 | #ifdef _LIBC |
34 | #include "namespace.h" | | 34 | #include "namespace.h" |
35 | #endif | | 35 | #endif |
36 | #include <sys/param.h> | | 36 | #include <sys/param.h> |
37 | #include <sys/sysctl.h> | | 37 | #include <sys/sysctl.h> |
38 | #include <ssp/ssp.h> | | 38 | #include <ssp/ssp.h> |
39 | #include <signal.h> | | 39 | #include <signal.h> |
40 | #include <string.h> | | 40 | #include <string.h> |
41 | #include <unistd.h> | | 41 | #include <unistd.h> |
42 | #ifdef _LIBC | | 42 | #ifdef _LIBC |
43 | #include <syslog.h> | | 43 | #include <syslog.h> |
44 | #include "extern.h" | | 44 | #include "extern.h" |
| @@ -46,37 +46,34 @@ __RCSID("$NetBSD: stack_protector.c,v 1. | | | @@ -46,37 +46,34 @@ __RCSID("$NetBSD: stack_protector.c,v 1. |
46 | #define __sysctl sysctl | | 46 | #define __sysctl sysctl |
47 | void xprintf(const char *fmt, ...); | | 47 | void xprintf(const char *fmt, ...); |
48 | #include <stdlib.h> | | 48 | #include <stdlib.h> |
49 | #endif | | 49 | #endif |
50 | | | 50 | |
51 | long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; | | 51 | long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; |
52 | static void __fail(const char *) __attribute__((__noreturn__)); | | 52 | static void __fail(const char *) __attribute__((__noreturn__)); |
53 | __dead void __stack_chk_fail_local(void); | | 53 | __dead void __stack_chk_fail_local(void); |
54 | void __guard_setup(void); | | 54 | void __guard_setup(void); |
55 | | | 55 | |
56 | void | | 56 | void |
57 | __guard_setup(void) | | 57 | __guard_setup(void) |
58 | { | | 58 | { |
59 | int mib[2]; | | 59 | static const int mib[2] = { CTL_KERN, KERN_ARND }; |
60 | size_t len; | | 60 | size_t len; |
61 | | | 61 | |
62 | if (__stack_chk_guard[0] != 0) | | 62 | if (__stack_chk_guard[0] != 0) |
63 | return; | | 63 | return; |
64 | | | 64 | |
65 | mib[0] = CTL_KERN; | | | |
66 | mib[1] = KERN_ARND; | | | |
67 | | | | |
68 | len = sizeof(__stack_chk_guard); | | 65 | len = sizeof(__stack_chk_guard); |
69 | if (__sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 || | | 66 | if (__sysctl(mib, __arraycount(mib), __stack_chk_guard, &len, NULL, 0) == -1 || |
70 | len != sizeof(__stack_chk_guard)) { | | 67 | len != sizeof(__stack_chk_guard)) { |
71 | /* If sysctl was unsuccessful, use the "terminator canary". */ | | 68 | /* If sysctl was unsuccessful, use the "terminator canary". */ |
72 | ((unsigned char *)(void *)__stack_chk_guard)[0] = 0; | | 69 | ((unsigned char *)(void *)__stack_chk_guard)[0] = 0; |
73 | ((unsigned char *)(void *)__stack_chk_guard)[1] = 0; | | 70 | ((unsigned char *)(void *)__stack_chk_guard)[1] = 0; |
74 | ((unsigned char *)(void *)__stack_chk_guard)[2] = '\n'; | | 71 | ((unsigned char *)(void *)__stack_chk_guard)[2] = '\n'; |
75 | ((unsigned char *)(void *)__stack_chk_guard)[3] = 255; | | 72 | ((unsigned char *)(void *)__stack_chk_guard)[3] = 255; |
76 | } | | 73 | } |
77 | } | | 74 | } |
78 | | | 75 | |
79 | /*ARGSUSED*/ | | 76 | /*ARGSUSED*/ |
80 | static void | | 77 | static void |
81 | __fail(const char *msg) | | 78 | __fail(const char *msg) |
82 | { | | 79 | { |