Merge branch 'patch-1' of https://github.com/Saarett/xv6-public

2017-08-07 13:29:11 -04:00 · 2017-08-07 13:29:11 -04:00 · 0249311675
parent 61f26e3c97 03b3086327
commit 0249311675
1 changed files with 3 additions and 1 deletions
--- a/vm.c
+++ b/vm.c
@ -137,8 +137,10 @@ setupkvm(void)
    panic("PHYSTOP too high");
  for(k = kmap; k < &kmap[NELEM(kmap)]; k++)
    if(mappages(pgdir, k->virt, k->phys_end - k->phys_start,
-                (uint)k->phys_start, k->perm) < 0)
+                (uint)k->phys_start, k->perm) < 0) {
+      freevm(pgdir);
      return 0;
+    }
  return pgdir;
 }