Copy important things like brk and start_brk in fork

isontheline · Dec 5, 2018 · 3e82469 · 3e82469
1 parent 5e89f7f
commit 3e82469
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Build 35
+### Fixed
+- `out of memory`/`short read` error from tar, due to fork setting brk to 0
+
 ## Build 34
 ### New
 - Enough stubs and instructions to get numpy to import successfully.

diff --git a/kernel/fork.c b/kernel/fork.c
@@ -56,6 +56,9 @@ static int copy_task(struct task *task, dword_t flags, addr_t stack, addr_t ptid
         mem_retain(mem);
     } else {
         task->mem = task->cpu.mem = mem_new();
+        task->mem->vdso = mem->vdso;
+        task->mem->brk = mem->brk;
+        task->mem->start_brk = mem->start_brk;
         write_wrlock(&mem->lock);
         pt_copy_on_write(mem, 0, task->mem, 0, MEM_PAGES);
         write_wrunlock(&mem->lock);