diff options
Diffstat (limited to 'debug')
| -rw-r--r-- | debug/Versions | 5 | ||||
| -rw-r--r-- | debug/fgets_chk.c | 2 | ||||
| -rw-r--r-- | debug/fgets_u_chk.c | 2 | ||||
| -rw-r--r-- | debug/getcwd_chk.c | 3 | ||||
| -rw-r--r-- | debug/getwd_chk.c | 3 | ||||
| -rw-r--r-- | debug/pread64_chk.c | 3 | ||||
| -rw-r--r-- | debug/pread_chk.c | 3 | ||||
| -rw-r--r-- | debug/read_chk.c | 3 | ||||
| -rw-r--r-- | debug/readlink_chk.c | 3 | ||||
| -rw-r--r-- | debug/recv_chk.c | 3 | ||||
| -rw-r--r-- | debug/recvfrom_chk.c | 3 | ||||
| -rw-r--r-- | debug/tst-chk1.c | 2 |
12 files changed, 14 insertions, 21 deletions
diff --git a/debug/Versions b/debug/Versions index 7cbb02c31e..051f4df000 100644 --- a/debug/Versions +++ b/debug/Versions @@ -19,6 +19,11 @@ libc { __gets_chk; } GLIBC_2.4 { + __fgets_chk; __fgets_unlocked_chk; + __read_chk; __pread_chk; __pread64_chk; + __readlink_chk; __getcwd_chk; __getwd_chk; + __recv_chk; __recvfrom_chk; + __stack_chk_fail; } } diff --git a/debug/fgets_chk.c b/debug/fgets_chk.c index 813d0dce64..27fbede7f0 100644 --- a/debug/fgets_chk.c +++ b/debug/fgets_chk.c @@ -30,7 +30,6 @@ #include <stdio.h> #include <sys/param.h> -#if 0 char * __fgets_chk (buf, size, n, fp) char *buf; @@ -66,4 +65,3 @@ __fgets_chk (buf, size, n, fp) _IO_release_lock (fp); return result; } -#endif diff --git a/debug/fgets_u_chk.c b/debug/fgets_u_chk.c index 50d4405533..324d7e371b 100644 --- a/debug/fgets_u_chk.c +++ b/debug/fgets_u_chk.c @@ -30,7 +30,6 @@ #include <stdio.h> #include <sys/param.h> -#if 0 char * __fgets_unlocked_chk (buf, size, n, fp) char *buf; @@ -64,4 +63,3 @@ __fgets_unlocked_chk (buf, size, n, fp) fp->_IO_file_flags |= old_error; return result; } -#endif diff --git a/debug/getcwd_chk.c b/debug/getcwd_chk.c index 8d33b77826..cb864c858e 100644 --- a/debug/getcwd_chk.c +++ b/debug/getcwd_chk.c @@ -20,7 +20,7 @@ #include <unistd.h> #include <sys/param.h> -#if 0 + char * __getcwd_chk (char *buf, size_t size, size_t buflen) { @@ -29,4 +29,3 @@ __getcwd_chk (char *buf, size_t size, size_t buflen) return __getcwd (buf, size); } -#endif diff --git a/debug/getwd_chk.c b/debug/getwd_chk.c index 3a224d94a4..898af28d3f 100644 --- a/debug/getwd_chk.c +++ b/debug/getwd_chk.c @@ -20,7 +20,7 @@ #include <unistd.h> #include <sys/param.h> -#if 0 + char * __getwd_chk (char *buf, size_t buflen) { @@ -32,4 +32,3 @@ __getwd_chk (char *buf, size_t buflen) link_warning (getwd, "the `getwd' function is dangerous and should not be used.") -#endif diff --git a/debug/pread64_chk.c b/debug/pread64_chk.c index 9db1894765..318579f0b5 100644 --- a/debug/pread64_chk.c +++ b/debug/pread64_chk.c @@ -19,7 +19,7 @@ #include <unistd.h> #include <sys/param.h> -#if 0 + ssize_t __pread64_chk (int fd, void *buf, size_t nbytes, off64_t offset, size_t buflen) { @@ -28,4 +28,3 @@ __pread64_chk (int fd, void *buf, size_t nbytes, off64_t offset, size_t buflen) return __libc_pread64 (fd, buf, nbytes, offset); } -#endif diff --git a/debug/pread_chk.c b/debug/pread_chk.c index 702fddaaa3..de111eaf82 100644 --- a/debug/pread_chk.c +++ b/debug/pread_chk.c @@ -19,7 +19,7 @@ #include <unistd.h> #include <sys/param.h> -#if 0 + ssize_t __pread_chk (int fd, void *buf, size_t nbytes, off_t offset, size_t buflen) { @@ -28,4 +28,3 @@ __pread_chk (int fd, void *buf, size_t nbytes, off_t offset, size_t buflen) return __pread (fd, buf, nbytes, offset); } -#endif diff --git a/debug/read_chk.c b/debug/read_chk.c index 0c36aaed4f..da2bc945b7 100644 --- a/debug/read_chk.c +++ b/debug/read_chk.c @@ -23,7 +23,7 @@ # include <sysdep.h> #endif -#if 0 + ssize_t __read_chk (int fd, void *buf, size_t nbytes, size_t buflen) { @@ -36,4 +36,3 @@ __read_chk (int fd, void *buf, size_t nbytes, size_t buflen) return __read (fd, buf, nbytes); #endif } -#endif diff --git a/debug/readlink_chk.c b/debug/readlink_chk.c index 8aabe0af25..ac18ee2c29 100644 --- a/debug/readlink_chk.c +++ b/debug/readlink_chk.c @@ -23,7 +23,7 @@ # include <sysdep.h> #endif -#if 0 + ssize_t __readlink_chk (const char *path, void *buf, size_t len, size_t buflen) { @@ -36,4 +36,3 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen) return __readlink (path, buf, len); #endif } -#endif diff --git a/debug/recv_chk.c b/debug/recv_chk.c index 090e63c5b9..479ebdfe72 100644 --- a/debug/recv_chk.c +++ b/debug/recv_chk.c @@ -19,7 +19,7 @@ #include <sys/param.h> #include <sys/socket.h> -#if 0 + ssize_t __recv_chk (int fd, void *buf, size_t n, size_t buflen, int flags) { @@ -28,4 +28,3 @@ __recv_chk (int fd, void *buf, size_t n, size_t buflen, int flags) return __recv (fd, buf, n, flags); } -#endif diff --git a/debug/recvfrom_chk.c b/debug/recvfrom_chk.c index 6fefcbd767..9790a15deb 100644 --- a/debug/recvfrom_chk.c +++ b/debug/recvfrom_chk.c @@ -19,7 +19,7 @@ #include <sys/param.h> #include <sys/socket.h> -#if 0 + ssize_t __recvfrom_chk (int fd, void *buf, size_t n, size_t buflen, int flags, __SOCKADDR_ARG addr, socklen_t *addr_len) @@ -29,4 +29,3 @@ __recvfrom_chk (int fd, void *buf, size_t n, size_t buflen, int flags, return __recvfrom (fd, buf, n, flags, addr, addr_len); } -#endif diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c index a9a7761f9e..dca41ab6dc 100644 --- a/debug/tst-chk1.c +++ b/debug/tst-chk1.c @@ -771,7 +771,7 @@ do_test (void) || strcmp (getcwdbuf + 1, fname) != 0) FAIL (); -#if 0 && __USE_FORTIFY_LEVEL >= 1 +#if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START if (getwd (getcwdbuf + 2) != getcwdbuf + 2) FAIL (); |