Add fortify_fn() helper in fortify-headers.h

1 files changed, 18 insertions, 30 deletions

diff --git a/include/stdio.h b/include/stdio.h
index ad80488..2e59e50 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -4,6 +4,7 @@
 #include_next <stdio.h>
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+#include "fortify-headers.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,20 +18,16 @@ extern "C" {
 #undef snprintf
 #undef sprintf
 
-__typeof__(fgets) __fgets_orig __asm__(__USER_LABEL_PREFIX__ "fgets");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-char *fgets(char *s, int n, FILE *fp)
+fortify_fn(fgets) char *fgets(char *s, int n, FILE *fp)
 {
         size_t bos = __builtin_object_size(s, 0);
 
         if ((size_t)n > bos)
                 __builtin_trap();
-        return __fgets_orig(s, n, fp);
+        return __orig_fgets(s, n, fp);
 }
 
-__typeof__(fread) __fread_orig __asm__(__USER_LABEL_PREFIX__ "fread");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-size_t fread(void *dst, size_t n, size_t nmemb, FILE *fp)
+fortify_fn(fread) size_t fread(void *dst, size_t n, size_t nmemb, FILE *fp)
 {
         size_t bos = __builtin_object_size(dst, 0);
 
@@ -38,12 +35,10 @@ size_t fread(void *dst, size_t n, size_t nmemb, FILE *fp)
                 __builtin_trap();
         if (n * nmemb > bos)
                 __builtin_trap();
-        return __fread_orig(dst, n, nmemb, fp);
+        return __orig_fread(dst, n, nmemb, fp);
 }
 
-__typeof__(fwrite) __fwrite_orig __asm__(__USER_LABEL_PREFIX__ "fwrite");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-size_t fwrite(const void *dst, size_t n, size_t nmemb, FILE *fp)
+fortify_fn(fwrite) size_t fwrite(const void *dst, size_t n, size_t nmemb, FILE *fp)
 {
         size_t bos = __builtin_object_size(dst, 0);
 
@@ -51,61 +46,54 @@ size_t fwrite(const void *dst, size_t n, size_t nmemb, FILE *fp)
                 __builtin_trap();
         if (n * nmemb > bos)
                 __builtin_trap();
-        return __fwrite_orig(dst, n, nmemb, fp);
+        return __orig_fwrite(dst, n, nmemb, fp);
 }
 
-__typeof__(vsnprintf) __vsnprintf_orig __asm__(__USER_LABEL_PREFIX__ "vsnprintf");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-int vsnprintf(char *s, size_t n, const char *fmt, __builtin_va_list ap)
+fortify_fn(vsnprintf) int vsnprintf(char *s, size_t n, const char *fmt,
+                                    __builtin_va_list ap)
 {
         size_t bos = __builtin_object_size(s, 0);
 
         if (n > bos)
                 __builtin_trap();
-        return __vsnprintf_orig(s, n, fmt, ap);
+        return __orig_vsnprintf(s, n, fmt, ap);
 }
 
-__typeof__(vsprintf) __vsprintf_orig __asm__(__USER_LABEL_PREFIX__ "vsprintf");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-int vsprintf(char *s, const char *fmt, __builtin_va_list ap)
+fortify_fn(vsprintf) int vsprintf(char *s, const char *fmt, __builtin_va_list ap)
 {
         size_t bos = __builtin_object_size(s, 0);
         int r;
 
         if (bos != (size_t)-1) {
-                r = __vsnprintf_orig(s, bos, fmt, ap);
+                r = __orig_vsnprintf(s, bos, fmt, ap);
                 if (r != -1 && (size_t)r >= bos)
                         __builtin_trap();
         } else {
-                r = __vsprintf_orig(s, fmt, ap);
+                r = __orig_vsprintf(s, fmt, ap);
         }
         return r;
 }
 
-__typeof__(snprintf) __snprintf_orig __asm__(__USER_LABEL_PREFIX__ "snprintf");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-int snprintf(char *s, size_t n, const char *fmt, ...)
+fortify_fn(snprintf) int snprintf(char *s, size_t n, const char *fmt, ...)
 {
         size_t bos = __builtin_object_size(s, 0);
 
         if (n > bos)
                 __builtin_trap();
-        return __snprintf_orig(s, n, fmt, __builtin_va_arg_pack());
+        return __orig_snprintf(s, n, fmt, __builtin_va_arg_pack());
 }
 
-__typeof__(sprintf) __sprintf_orig __asm__(__USER_LABEL_PREFIX__ "sprintf");
-extern __inline __attribute__((__always_inline__,__gnu_inline__,__artificial__))
-int sprintf(char *s, const char *fmt, ...)
+fortify_fn(sprintf) int sprintf(char *s, const char *fmt, ...)
 {
         size_t bos = __builtin_object_size(s, 0);
         int r;
 
         if (bos != (size_t)-1) {
-                r = __snprintf_orig(s, bos, fmt, __builtin_va_arg_pack());
+                r = __orig_snprintf(s, bos, fmt, __builtin_va_arg_pack());
                 if (r != -1 && (size_t)r >= bos)
                         __builtin_trap();
         } else {
-                r = __sprintf_orig(s, fmt, __builtin_va_arg_pack());
+                r = __orig_sprintf(s, fmt, __builtin_va_arg_pack());
         }
         return r;
 }