Libc-1439.100.3.tar.gz

[apple/libc.git] / sys / OpenBSD / stack_protector.c

diff --git a/sys/OpenBSD/stack_protector.c b/sys/OpenBSD/stack_protector.c
index 7b9653255f0f2efee0c3f094a067084bf96ce669..7ac7c7b434c1455d485263e4cbf2236b6ea91da6 100644 (file)
--- a/sys/OpenBSD/stack_protector.c
+++ b/sys/OpenBSD/stack_protector.c
@@ -28,65 +28,105 @@
  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>

-#include <sys/sysctl.h>

 #include <signal.h>
 #include <string.h>
 #include <signal.h>
 #include <string.h>

-#include <syslog.h>
+#include <stdlib.h>

 #include <unistd.h>
 #include <unistd.h>

+#include <sys/types.h>
+#include <fcntl.h>
+#if __has_include(<CrashReporterClient.h>)
+#include <CrashReporterClient.h>
+#else
+#define CRSetCrashLogMessage(...)
+#endif
+#include "libproc.h"
+#include "_simple.h"

 
 

-extern int __sysctl(int *, u_int, void *, size_t *, void *, size_t);
-
-long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-static void __guard_setup(void) __attribute__ ((constructor));
-void __stack_smash_handler(char func[], int damaged __attribute__((unused)));
+#define        GUARD_MAX 8
+long __stack_chk_guard[GUARD_MAX] = {0, 0, 0, 0, 0, 0, 0, 0};
+void __abort(void) __cold __dead2;
+void __guard_setup(const char *apple[]) __attribute__ ((visibility ("hidden")));
+void __stack_chk_fail(void);

 
 static void
 
 static void

-__guard_setup(void)
+__guard_from_kernel(const char *str)

 {
 {

-       int mib[2];
-       size_t len;
+       unsigned long long val;
+       char tmp[20], *p;
+       int idx = 0;

 
 

-       if (__guard[0] != 0)
+       /* Skip over the 'stack_guard=' key to the list of values */
+       str = strchr(str, '=');
+       if (str == NULL)

                return;
                return;

+       str++;

 
 

-       mib[0] = CTL_KERN;
-       mib[1] = KERN_ARND;
-
-       len = sizeof(__guard);
-       if (__sysctl(mib, 2, __guard, &len, NULL, 0) == -1 ||
-           len != sizeof(__guard)) {
-               /* If sysctl was unsuccessful, use the "terminator canary". */
-               ((unsigned char *)__guard)[0] = 0;
-               ((unsigned char *)__guard)[1] = 0;
-               ((unsigned char *)__guard)[2] = '\n';
-               ((unsigned char *)__guard)[3] = 255;
+       while (str && idx < GUARD_MAX) {
+               /*
+                * Pull the next numeric string out of the list and convert it to
+                * a real number.
+                */
+               strlcpy(tmp, str, 20);
+               p = strchr(tmp, ',');
+               if (p)
+                       *p = '\0';
+               val = strtoull(tmp, NULL, 0);
+               __stack_chk_guard[idx] = (long)(val & ((unsigned long) -1));
+               idx++;
+               if ((str = strchr(str, ',')) != NULL)
+                       str++;

        }
 }
 
        }
 }
 

-/*ARGSUSED*/

 void
 void

-__stack_smash_handler(char func[], int damaged)
+__guard_setup(const char *apple[])

 {
 {

-       struct syslog_data sdata = SYSLOG_DATA_INIT;
-       const char message[] = "stack overflow in function %s";
-       struct sigaction sa;
-       sigset_t mask;
+       int fd;
+       size_t len;
+       const char **p;

 
 

-       /* Immediately block all signal handlers from running code */
-       sigfillset(&mask);
-       sigdelset(&mask, SIGABRT);
-       sigprocmask(SIG_BLOCK, &mask, NULL);
+       if (__stack_chk_guard[0] != 0)
+               return;

 
 

-       /* This may fail on a chroot jail... */
-       syslog_r(LOG_CRIT, &sdata, message, func);
+       for (p = apple; p && *p; p++) {
+               if (strstr(*p, "stack_guard") == *p) {
+                       __guard_from_kernel(*p);
+                       bzero((void*)*p, strlen(*p));
+                       if (__stack_chk_guard[0] != 0) {
+                               return;
+                       }
+               }
+       }

 
 

-       bzero(&sa, sizeof(struct sigaction));
-       sigemptyset(&sa.sa_mask);
-       sa.sa_flags = 0;
-       sa.sa_handler = SIG_DFL;
-       sigaction(SIGABRT, &sa, NULL);
+       fd = open ("/dev/urandom", 0);
+       if (fd != -1) {
+               len = read (fd, (char*)&__stack_chk_guard, sizeof(__stack_chk_guard));
+               close(fd);
+               if (len == sizeof(__stack_chk_guard) && 
+                    *__stack_chk_guard != 0)
+                       return;
+       }

 
 

-       kill(getpid(), SIGABRT);
+       /* If If a random generator can't be used, the protector switches the guard
+           to the "terminator canary" */
+       ((unsigned char *)__stack_chk_guard)[0] = 0;
+       ((unsigned char *)__stack_chk_guard)[1] = 0;
+       ((unsigned char *)__stack_chk_guard)[2] = '\n';
+       ((unsigned char *)__stack_chk_guard)[3] = 255;
+}
+
+static const char *stackoverflow_msg = "stack buffer overflow";
+
+void
+__stack_chk_fail()
+{
+       CRSetCrashLogMessage(stackoverflow_msg);
+
+       /* This may fail on a chroot jail... */
+       char prog[2*MAXCOMLEN+1] = {0};
+       proc_name(getpid(), prog, 2*MAXCOMLEN);
+       prog[2*MAXCOMLEN] = 0;
+       _simple_asl_log_prog(ASL_LEVEL_CRIT, "user", stackoverflow_msg, prog);

 
 

-       _exit(127);
+       __abort();

 }
 }