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

peterhpc · Aug 7, 2017 · 0249311 · 0249311
2 parents 61f26e3 + 03b3086
commit 0249311
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;
 }