security hardening: ensure suid programs have valid stdin/out/err

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 906de2c..d985902 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,18 +5,17 @@
 #include <stdio.h>
 
 struct __libc {
-       int *(*errno_location)(void);
-       void (*testcancel)(void);
+       void *main_thread;
        int threaded;
-       int canceldisable;
-       void (*fork_handler)(int);
+       int secure;
+       size_t *auxv;
        int (*atexit)(void (*)(void));
        void (*fini)(void);
        void (*ldso_fini)(void);
        volatile int threads_minus_1;
-       int ofl_lock;
+       int canceldisable;
        FILE *ofl_head;
-       void *main_thread;
+       int ofl_lock;
 };
 
 
@@ -38,11 +37,13 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 /* Designed to avoid any overhead in non-threaded processes */
 void __lock(volatile int *);
-void __lockfile(FILE *);
+int __lockfile(FILE *);
+void __unlockfile(FILE *);
 #define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
 #define UNLOCK(x) (*(volatile int *)(x)=0)
 
 void __synccall(void (*)(void *), void *);
+void __synccall_wait(void);
 int __setxid(int, int, int, int);
 
 extern char **__environ;