Merge branch 'linus' into tracing/mmiotrace

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 8c828a68d3b..0a778e3c43e 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -508,6 +508,11 @@ static int vmalloc_fault(unsigned long address)
         unsigned long pgd_paddr;
         pmd_t *pmd_k;
         pte_t *pte_k;
+
+        /* Make sure we are in vmalloc area */
+        if (!(address >= VMALLOC_START && address < VMALLOC_END))
+                return -1;
+
         /*
          * Synchronize this task's top level page-table
          * with the 'reference' page table.