diff --git a/[refs] b/[refs] index af4a54af1022..72dc9c00e12b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3703f39965a197ebd91743fc38d0f640606b8da3 +refs/heads/master: b29c701deacd5d24453127c37ed77ef851c53b8b diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c index fd7e1798c75a..8bcb6f40ccb6 100644 --- a/trunk/arch/x86/mm/fault.c +++ b/trunk/arch/x86/mm/fault.c @@ -497,6 +497,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.