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/strings.h | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'include/strings.h')

diff --git a/include/strings.h b/include/strings.h
index e23c8eb..943b565 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -5,36 +5,26 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#define __errordecl(name, msg) extern void name(void) __attribute__ ((__error__(msg)))
-
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \
  || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \
  || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
-__errordecl(__bcopy_error, "bcopy: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 void
 __fortify_bcopy(const void *src, void *dest, size_t n)
 {
 	size_t bos = __builtin_object_size(dest, 0);
 
-	if (__builtin_constant_p(n) && n > bos)
-		__bcopy_error();
-
 	if (n > bos)
 		__builtin_trap();
 	return bcopy(src, dest, n);
 }
 
-__errordecl(__bzero_error, "bzero: buffer overflow detected");
 static inline __attribute__ ((always_inline))
 void
 __fortify_bzero(void *src, size_t n)
 {
 	size_t bos = __builtin_object_size(src, 0);
 
-	if (__builtin_constant_p(n) && n > bos)
-		__bzero_error();
-
 	if (n > bos)
 		__builtin_trap();
 	return bzero(src, n);
@@ -46,8 +36,6 @@ __fortify_bzero(void *src, size_t n)
 #define bzero(src, n) __fortify_bzero(src, n)
 #endif
 
-#undef __errordecl
-
 #endif
 
 #endif
-- 
cgit v1.3