diff options
Diffstat (limited to 'sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch')
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch | 144 |
1 files changed, 0 insertions, 144 deletions
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch deleted file mode 100644 index 2a230f1d3da5..000000000000 --- a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -u -r -N glibc-2.3.2.ORIG/sysdeps/generic/libc-start.c glibc-2.3.2/sysdeps/generic/libc-start.c ---- glibc-2.3.2.ORIG/sysdeps/generic/libc-start.c 2003-02-14 23:59:15.000000000 +0100 -+++ glibc-2.3.2/sysdeps/generic/libc-start.c 2003-11-08 21:32:03.000000000 +0100 -@@ -184,6 +184,9 @@ - _dl_debug_printf ("\ntransferring control: %s\n\n", argv[0]); - #endif - -+ /* call the __guard_setup to set up the random __guard value */ -+ __guard_setup (); /* pappy@gentoo.org */ -+ - #ifdef HAVE_CLEANUP_JMP_BUF - /* Memory for the cancellation buffer. */ - struct pthread_unwind_buf unwind_buf; -diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Dist glibc-2.3.2/sysdeps/unix/sysv/linux/Dist ---- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Dist 2003-02-21 07:30:10.000000000 +0100 -+++ glibc-2.3.2/sysdeps/unix/sysv/linux/Dist 2003-11-08 21:13:58.000000000 +0100 -@@ -1,3 +1,4 @@ -+ssp.c - bits/initspin.h - cmsg_nxthdr.c - dl-brk.c -diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Makefile glibc-2.3.2/sysdeps/unix/sysv/linux/Makefile ---- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Makefile 2002-12-17 00:36:52.000000000 +0100 -+++ glibc-2.3.2/sysdeps/unix/sysv/linux/Makefile 2003-11-08 21:13:58.000000000 +0100 -@@ -1,5 +1,5 @@ - ifeq ($(subdir),csu) --sysdep_routines += errno-loc -+sysdep_routines += errno-loc ssp - endif - - ifeq ($(subdir),db2) -diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Versions glibc-2.3.2/sysdeps/unix/sysv/linux/Versions ---- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Versions 2002-12-17 00:28:17.000000000 +0100 -+++ glibc-2.3.2/sysdeps/unix/sysv/linux/Versions 2003-11-08 21:13:58.000000000 +0100 -@@ -108,6 +108,8 @@ - GLIBC_2.3.2 { - # New kernel interfaces. - epoll_create; epoll_ctl; epoll_wait; -+ # global objects and functions for the propolice patch in gcc - moved from libgcc by pappy@gentoo.org -+ __guard; __guard_setup; __stack_smash_handler; - } - GLIBC_PRIVATE { - # needed by libpthread. -diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/ssp.c glibc-2.3.2/sysdeps/unix/sysv/linux/ssp.c ---- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/ssp.c 1970-01-01 01:00:00.000000000 +0100 -+++ glibc-2.3.2/sysdeps/unix/sysv/linux/ssp.c 2003-11-08 21:13:58.000000000 +0100 -@@ -0,0 +1,97 @@ -+#include <stdio.h> -+#include <string.h> -+#include <fcntl.h> -+#include <unistd.h> -+ -+#ifdef _POSIX_SOURCE -+#include <signal.h> -+#endif -+ -+#if defined(HAVE_SYSLOG) -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/un.h> -+ -+#include <sys/syslog.h> -+#ifndef _PATH_LOG -+#define _PATH_LOG "/dev/log" -+#endif -+#endif -+ -+long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; -+ -+void __guard_setup (void) -+{ -+ int fd; -+ if (__guard[0]!=0) return; -+ fd = open ("/dev/urandom", 0); -+ if (fd != -1) { -+ ssize_t size = read (fd, (char*)&__guard, sizeof(__guard)); -+ close (fd) ; -+ if (size == sizeof(__guard)) return; -+ } -+ /* If a random generator can't be used, the protector switches the guard -+ to the "terminator canary" */ -+ ((char*)__guard)[0] = 0; ((char*)__guard)[1] = 0; -+ ((char*)__guard)[2] = '\n'; ((char*)__guard)[3] = 255; -+} -+ -+void __stack_smash_handler (char func[], int damaged) -+{ -+#if defined (__GNU_LIBRARY__) -+ extern char * __progname; -+#endif -+ const char message[] = ": stack smashing attack in function "; -+ int bufsz = 512, len; -+ char buf[bufsz]; -+#if defined(HAVE_SYSLOG) -+ int LogFile; -+ struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */ -+#endif -+#ifdef _POSIX_SOURCE -+ { -+ sigset_t mask; -+ sigfillset(&mask); -+ sigdelset(&mask, SIGABRT); /* Block all signal handlers */ -+ sigprocmask(SIG_BLOCK, &mask, NULL); /* except SIGABRT */ -+ } -+#endif -+ -+ strcpy(buf, "<2>"); len=3; /* send LOG_CRIT */ -+#if defined (__GNU_LIBRARY__) -+ strncat(buf, __progname, bufsz-len-1); len = strlen(buf); -+#endif -+ if (bufsz>len) {strncat(buf, message, bufsz-len-1); len = strlen(buf);} -+ if (bufsz>len) {strncat(buf, func, bufsz-len-1); len = strlen(buf);} -+ /* print error message */ -+ write (STDERR_FILENO, buf+3, len-3); -+#if defined(HAVE_SYSLOG) -+ if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) != -1) { -+ -+ /* -+ * Send "found" message to the "/dev/log" path -+ */ -+ SyslogAddr.sun_family = AF_UNIX; -+ (void)strncpy(SyslogAddr.sun_path, _PATH_LOG, -+ sizeof(SyslogAddr.sun_path) - 1); -+ SyslogAddr.sun_path[sizeof(SyslogAddr.sun_path) - 1] = '\0'; -+ sendto(LogFile, buf, len, 0, (struct sockaddr *)&SyslogAddr, -+ sizeof(SyslogAddr)); -+ } -+#endif -+ -+#ifdef _POSIX_SOURCE -+ { /* Make sure the default handler is associated with SIGABRT */ -+ struct sigaction sa; -+ -+ memset(&sa, 0, sizeof(struct sigaction)); -+ sigfillset(&sa.sa_mask); /* Block all signals */ -+ sa.sa_flags = 0; -+ sa.sa_handler = SIG_DFL; -+ sigaction(SIGABRT, &sa, NULL); -+ (void)kill(getpid(), SIGABRT); -+ } -+#endif -+ _exit(127); -+} -+ |