pk: fix __do_brk when new addr is not feasible (#295)

Linux kernel simply return current brk when request brk addr is not feasible. The pk should probably do the same.
riscv-software-src · May 1, 2023 · 8ce2dc4 · 8ce2dc4
1 parent 3ed18cf
commit 8ce2dc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pk/elf.c b/pk/elf.c
@@ -96,6 +96,7 @@ void load_elf(const char* fn, elf_info* info)
   }
 
   file_decref(file);
+  info->brk = ROUNDUP(info->brk_min, RISCV_PGSIZE);
   return;
 
 fail:

diff --git a/pk/mmap.c b/pk/mmap.c
@@ -433,13 +433,8 @@ uintptr_t do_mmap(uintptr_t addr, size_t length, int prot, int flags, int fd, of
 uintptr_t __do_brk(size_t addr)
 {
   uintptr_t newbrk = addr;
-  if (addr < current.brk_min)
-    newbrk = current.brk_min;
-  else if (addr > current.brk_max)
-    newbrk = current.brk_max;
-
-  if (current.brk == 0)
-    current.brk = ROUNDUP(current.brk_min, RISCV_PGSIZE);
+  if (addr < current.brk_min || addr > current.brk_max)
+    return current.brk;
 
   uintptr_t newbrk_page = ROUNDUP(newbrk, RISCV_PGSIZE);
   if (current.brk > newbrk_page) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,7 @@ void load_elf(const char* fn, elf_info* info) @@
       }
       file_decref(file);
+      info->brk = ROUNDUP(info->brk_min, RISCV_PGSIZE);
       return;
     fail:
@@ Expand Down @@