Merge branch 'linus' into stackprotector

2008-06-25 12:27:29 +02:00
parent 7c9f8861e6 543cf4cb3f
commit 5ce001b0e5
1079 changed files with 21821 additions and 12648 deletions
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -498,6 +498,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.