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

02493116 · Frans Kaashoek · 61f26e3c · 03b30863 · 02493116
--- 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;
 }