X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__libc_start_main.c;h=5c79be28f0b5c8205a53ad1f23510b57da9ca7d4;hb=a8cc2253843e30dfbdf0bb2954439d9f2b2e8704;hp=aef9f9ec72c6032f273309e111bc7c2b307310cd;hpb=b4ea63856a6af3d1bcc2db12537785371ac2024c;p=musl

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index aef9f9ec..5c79be28 100644
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -1,14 +1,23 @@
 #include <elf.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <signal.h>
+#include "syscall.h"
+#include "atomic.h"
 #include "libc.h"
 
 void __init_tls(size_t *);
-void __init_security(size_t *);
-void __init_ldso_ctors(void);
 
-#define AUX_CNT 38
+static void dummy(void) {}
+weak_alias(dummy, _init);
+
+__attribute__((__weak__, __visibility__("hidden")))
+extern void (*const __init_array_start)(void), (*const __init_array_end)(void);
 
-extern size_t __hwcap, __sysinfo;
-extern char *__progname, *__progname_full;
+static void dummy1(void *p) {}
+weak_alias(dummy1, __init_ssp);
+
+#define AUX_CNT 38
 
 void __init_libc(char **envp, char *pn)
 {
@@ -19,6 +28,7 @@ void __init_libc(char **envp, char *pn)
 	for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT) aux[auxv[i]] = auxv[i+1];
 	__hwcap = aux[AT_HWCAP];
 	__sysinfo = aux[AT_SYSINFO];
+	libc.page_size = aux[AT_PAGESZ];
 
 	if (pn) {
 		__progname = __progname_full = pn;
@@ -26,29 +36,41 @@ void __init_libc(char **envp, char *pn)
 	}
 
 	__init_tls(aux);
-	__init_security(aux);
+	__init_ssp((void *)aux[AT_RANDOM]);
+
+	if (aux[AT_UID]==aux[AT_EUID] && aux[AT_GID]==aux[AT_EGID]
+		&& !aux[AT_SECURE]) return;
+
+	struct pollfd pfd[3] = { {.fd=0}, {.fd=1}, {.fd=2} };
+#ifdef SYS_poll
+	__syscall(SYS_poll, pfd, 3, 0);
+#else
+	__syscall(SYS_ppoll, pfd, 3, &(struct timespec){0}, 0, _NSIG/8);
+#endif
+	for (i=0; i<3; i++) if (pfd[i].revents&POLLNVAL)
+		if (__sys_open("/dev/null", O_RDWR)<0)
+			a_crash();
+	libc.secure = 1;
 }
 
-int __libc_start_main(
-	int (*main)(int, char **, char **), int argc, char **argv,
-	int (*init)(int, char **, char **), void (*fini)(void),
-	void (*ldso_fini)(void))
+static void libc_start_init(void)
 {
-	char **envp = argv+argc+1;
-
-	__init_libc(envp, argv[0]);
+	_init();
+	uintptr_t a = (uintptr_t)&__init_array_start;
+	for (; a<(uintptr_t)&__init_array_end; a+=sizeof(void(*)()))
+		(*(void (**)())a)();
+}
 
-	libc.ldso_fini = ldso_fini;
-	libc.fini = fini;
+weak_alias(libc_start_init, __libc_start_init);
 
-	/* Execute constructors (static) linked into the application */
-	if (init) init(argc, argv, envp);
+int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
+{
+	char **envp = argv+argc+1;
 
-#ifdef SHARED
-	__init_ldso_ctors();
-#endif
+	__init_libc(envp, argv[0]);
+	__libc_start_init();
 
-	/* Pass control to to application */
+	/* Pass control to the application */
 	exit(main(argc, argv, envp));
 	return 0;
 }