Changeset c867756e in mainline

Timestamp:

2008-09-08T21:00:30Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e40e3007

Parents:

91befde0

Message:

Write protection fault should not panic the mips32 kernel if it happens during
copy_to_uspace().

File:

• kernel/arch/mips32/src/mm/tlb.c (modified) (3 diffs)

kernel/arch/mips32/src/mm/tlb.c

@@ -288 +288 @@
 
         /*
-         * Fail if the page is not writable.
-         */
-        if (!pte->w)
-                goto fail;
-
-        /*
          * Read the faulting TLB entry.
          */
@@ -403 +397 @@
          */     
         pte = page_mapping_find(AS, badvaddr);
-        if (pte && pte->p) {
+        if (pte && pte->p && (pte->w || access != PF_ACCESS_WRITE)) {
                 /*
                  * Mapping found in page tables.
@@ -426 +420 @@
                         pte = page_mapping_find(AS, badvaddr);
                         ASSERT(pte && pte->p);
+                        ASSERT(pte->w || access != PF_ACCESS_WRITE);
                         return pte;
                         break;