Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[platform/kernel/linux-rpi.git] / arch / arm / mm / fault.c

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index f8fe0ec..2418f1e 100644 (file)
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -105,6 +105,19 @@ static inline bool is_write_fault(unsigned int fsr)
        return (fsr & FSR_WRITE) && !(fsr & FSR_CM);
 }
 
+static inline bool is_translation_fault(unsigned int fsr)
+{
+       int fs = fsr_fs(fsr);
+#ifdef CONFIG_ARM_LPAE
+       if ((fs & FS_MMU_NOLL_MASK) == FS_TRANS_NOLL)
+               return true;
+#else
+       if (fs == FS_L1_TRANS || fs == FS_L2_TRANS)
+               return true;
+#endif
+       return false;
+}
+
 static void die_kernel_fault(const char *msg, struct mm_struct *mm,
                             unsigned long addr, unsigned int fsr,
                             struct pt_regs *regs)
@@ -141,7 +154,8 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
        if (addr < PAGE_SIZE) {
                msg = "NULL pointer dereference";
        } else {
-               if (kfence_handle_page_fault(addr, is_write_fault(fsr), regs))
+               if (is_translation_fault(fsr) &&
+                   kfence_handle_page_fault(addr, is_write_fault(fsr), regs))
                        return;
 
                msg = "paging request";
@@ -209,7 +223,7 @@ static inline bool is_permission_fault(unsigned int fsr)
 {
        int fs = fsr_fs(fsr);
 #ifdef CONFIG_ARM_LPAE
-       if ((fs & FS_PERM_NOLL_MASK) == FS_PERM_NOLL)
+       if ((fs & FS_MMU_NOLL_MASK) == FS_PERM_NOLL)
                return true;
 #else
        if (fs == FS_L1_PERM || fs == FS_L2_PERM)