Fix assertion.

[pintos-anon] / src / userprog / pagedir.c

diff --git a/src/userprog/pagedir.c b/src/userprog/pagedir.c
index 6c819c790efb9afff04980dd2f162f0a6f3d5469..7d1018eadde49f68711ccfbd69e6060553804352 100644 (file)
--- a/src/userprog/pagedir.c
+++ b/src/userprog/pagedir.c
@@ -28,6 +28,7 @@ pagedir_destroy (uint32_t *pd)
   if (pd == NULL)
     return;
 
+  ASSERT (pd != base_page_dir);
   for (pde = pd; pde < pd + pd_no (PHYS_BASE); pde++)
     if (*pde & PG_P) 
       {
@@ -47,14 +48,18 @@ pagedir_destroy (uint32_t *pd)
    If UADDR is unmapped, behavior varies based on CREATE:
    if CREATE is true, then a new, zeroed page is created and a
    pointer into it is returned,
-   otherwise a null pointer is returned. */
+   otherwise a null pointer is returned.
+   Also returns a null pointer if UADDR is a kernel address. */
 static uint32_t *
 lookup_page (uint32_t *pd, void *uaddr, bool create)
 {
   uint32_t *pt, *pde;
 
   ASSERT (pd != NULL);
-  ASSERT (uaddr < PHYS_BASE);
+
+  /* Make sure it's a user address. */
+  if (uaddr >= PHYS_BASE)
+    return NULL;
 
   /* Check for a page table for UADDR.
      If one is missing, create one if requested. */
@@ -93,7 +98,8 @@ pagedir_set_page (uint32_t *pd, void *upage, void *kpage,
 
   ASSERT (pg_ofs (upage) == 0);
   ASSERT (pg_ofs (kpage) == 0);
-  ASSERT (lookup_page (pd, upage, false) == NULL);
+  ASSERT (upage < PHYS_BASE);
+  ASSERT (pagedir_get_page (pd, upage) == NULL);
 
   pte = lookup_page (pd, upage, true);
   if (pte != NULL)