Changeset 180e132 in mainline

Timestamp:

2019-06-15T09:29:21Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4484c16

Parents:

2e311da

Message:

Use istate_from_uspace instead of is_kernel_fault

Userspace code can try to jump to a kernel address in which case some of
the TLB fault handlers would wrongly assume the fault happened in the
kernel and panic.

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (4 diffs)

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

@@ -484 +484 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa; /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);
@@ -680 +680 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);
@@ -752 +752 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         /*
@@ -779 +779 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);