2 files changed, 37 insertions, 24 deletions

diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 87dcc74..cc26fa1 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -29,8 +29,10 @@
 
 #include <sys/types.h>
 #include <sys/proc.h>
+#include <sys/errno.h>
 #include <sys/cdefs.h>
 #include <sys/vnode.h>
+#include <sys/tree.h>
 #include <sys/syscall.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
@@ -100,6 +102,32 @@ proc_coredump(struct proc *td, uintptr_t fault_addr)
     fd_close(fd);
 }
 
+int
+proc_init(struct proc *td, struct proc *parent)
+{
+    struct mmap_lgdr *mlgdr;
+
+    mlgdr = dynalloc(sizeof(*mlgdr));
+    if (mlgdr == NULL) {
+        return -ENOMEM;
+    }
+
+    /* Add to parent leafq */
+    TAILQ_INSERT_TAIL(&parent->leafq, td, leaf_link);
+    atomic_inc_int(&parent->nleaves);
+    td->parent = parent;
+    td->exit_status = -1;
+    td->cred = parent->cred;
+
+    /* Initialize the mmap ledger */
+    mlgdr->nbytes = 0;
+    RBT_INIT(lgdr_entries, &mlgdr->hd);
+    td->mlgdr = mlgdr;
+    td->flags |= PROC_WAITED;
+    signals_init(td);
+    return 0;
+}
+
 scret_t
 sys_getpid(struct syscall_args *scargs)
 {
diff --git a/sys/kern/kern_spawn.c b/sys/kern/kern_spawn.c
index b9551f3..5f9262d 100644
--- a/sys/kern/kern_spawn.c
+++ b/sys/kern/kern_spawn.c
@@ -145,7 +145,6 @@ pid_t
 spawn(struct proc *cur, void(*func)(void), void *p, int flags, struct proc **newprocp)
 {
     struct proc *newproc;
-    struct mmap_lgdr *mlgdr;
     int error;
     pid_t pid;
 
@@ -156,19 +155,10 @@ spawn(struct proc *cur, void(*func)(void), void *p, int flags, struct proc **new
         return -ENOMEM;
     }
 
-    mlgdr = dynalloc(sizeof(*mlgdr));
-    if (mlgdr == NULL) {
-        dynfree(newproc);
-        try_free_data(p);
-        pr_error("could not alloc proc mlgdr (-ENOMEM)\n");
-        return -ENOMEM;
-    }
-
     memset(newproc, 0, sizeof(*newproc));
     error = md_spawn(newproc, cur, (uintptr_t)func);
     if (error < 0) {
         dynfree(newproc);
-        dynfree(mlgdr);
         try_free_data(p);
         pr_error("error initializing proc\n");
         return error;
@@ -184,23 +174,18 @@ spawn(struct proc *cur, void(*func)(void), void *p, int flags, struct proc **new
         cur->flags |= PROC_LEAFQ;
     }
 
-    /* Add to parent leafq */
-    TAILQ_INSERT_TAIL(&cur->leafq, newproc, leaf_link);
-    atomic_inc_int(&cur->nleaves);
-    newproc->parent = cur;
-    newproc->data = p;
-    newproc->exit_status = -1;
-    newproc->cred = cur->cred;
-
-    /* Initialize the mmap ledger */
-    mlgdr->nbytes = 0;
-    RBT_INIT(lgdr_entries, &mlgdr->hd);
-    newproc->mlgdr = mlgdr;
-    newproc->flags |= PROC_WAITED;
+    error = proc_init(newproc, cur);
+    if (error < 0) {
+        dynfree(newproc);
+        try_free_data(p);
+        pr_error("error initializing proc\n");
+        return error;
+    }
 
+    newproc->data = p;
     atomic_inc_64(&g_nthreads);
+
     newproc->pid = next_pid++;
-    signals_init(newproc);
     sched_enqueue_td(newproc);
     pid = newproc->pid;
     return pid;