From eecef18261cc278fbc13ecbfb4e5bc10762cc794 Mon Sep 17 00:00:00 2001
From: sin
Date: Tue, 24 Feb 2015 18:12:27 +0000
Subject: Remove compile time checks

These can produce false positives.  Given that we support fortify
source level 1 we shouldn't break valid code.
---
 include/unistd.h | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'include/unistd.h')

diff --git a/include/unistd.h b/include/unistd.h
index bffccf7..b13b507 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -5,78 +5,56 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#define __errordecl(name, msg) extern void name(void) __attribute__ ((__error__(msg)))
-
-__errordecl(__confstr_error, "confstr: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 size_t
 __fortify_confstr(int name, char *buf, size_t len)
 {
 	size_t bos = __builtin_object_size(buf, 0);
 
-	if (__builtin_constant_p(len) && len > bos)
-		__confstr_error();
-
 	if (len > bos)
 		__builtin_trap();
 	return confstr(name, buf, len);
 }
 
-__errordecl(__getcwd_error, "getcwd: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 char *
 __fortify_getcwd(char *buf, size_t len)
 {
 	size_t bos = __builtin_object_size(buf, 0);
 
-	if (__builtin_constant_p(len) && len > bos)
-		__getcwd_error();
-
 	if (len > bos)
 		__builtin_trap();
 	return getcwd(buf, len);
 }
 
-__errordecl(__gethostname_error, "gethostname: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 int
 __fortify_gethostname(char *name, size_t len)
 {
 	size_t bos = __builtin_object_size(name, 0);
 
-	if (__builtin_constant_p(len) && len > bos)
-		__gethostname_error();
-
 	if (len > bos)
 		__builtin_trap();
 	return gethostname(name, len);
 }
 
-__errordecl(__pread_error, "pread: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 ssize_t
 __fortify_pread(int fd, void *buf, size_t n, off_t offset)
 {
 	size_t bos = __builtin_object_size(buf, 0);
 
-	if (__builtin_constant_p(n) && n > bos)
-		__pread_error();
-
 	if (n > bos)
 		__builtin_trap();
 	return pread(fd, buf, n, offset);
 }
 
-__errordecl(__read_error, "read: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 ssize_t
 __fortify_read(int fd, void *buf, size_t n)
 {
 	size_t bos = __builtin_object_size(buf, 0);
 
-	if (__builtin_constant_p(n) && n > bos)
-		__read_error();
-
 	if (n > bos)
 		__builtin_trap();
 	return read(fd, buf, n);
@@ -93,8 +71,6 @@ __fortify_read(int fd, void *buf, size_t n)
 #undef read
 #define read(fd, buf, n) __fortify_read(fd, buf, n)
 
-#undef __errordecl
-
 #endif
 
 #endif
-- 
cgit v1.3