fix invalid free of partial addrinfo list with multiple services

[musl] / src / process / fork.c

diff --git a/src/process/fork.c b/src/process/fork.c
index 1a82f42..11286ef 100644 (file)
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -1,5 +1,6 @@
 #include <unistd.h>
 #include <string.h>
+#include <signal.h>
 #include "syscall.h"
 #include "libc.h"
 #include "pthread_impl.h"
@@ -16,15 +17,20 @@ pid_t fork(void)
        sigset_t set;
        __fork_handler(-1);
        __block_all_sigs(&set);
-       ret = syscall(SYS_fork);
-       if (libc.main_thread && !ret) {
+#ifdef SYS_fork
+       ret = __syscall(SYS_fork);
+#else
+       ret = __syscall(SYS_clone, SIGCHLD, 0);
+#endif
+       if (!ret) {
                pthread_t self = __pthread_self();
-               self->tid = self->pid = syscall(SYS_getpid);
-               memset(&self->robust_list, 0, sizeof self->robust_list);
+               self->tid = __syscall(SYS_gettid);
+               self->robust_list.off = 0;
+               self->robust_list.pending = 0;
+               self->next = self->prev = self;
                libc.threads_minus_1 = 0;
-               libc.main_thread = self;
        }
        __restore_sigs(&set);
        __fork_handler(!ret);
-       return ret;
+       return __syscall_ret(ret);
 }