diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:29 +0200 |
| commit | 5ce001b0e56638c726270d4f9e05d46d4250dfbb (patch) | |
| tree | c21cf007ddef99d5e8b23dde9621bd9152e676a8 /arch/x86/mm/fault.c | |
| parent | stackprotector: use canary at end of stack to indicate overruns at oops time (diff) | |
| parent | Linux 2.6.26-rc8 (diff) | |
| download | linux-dev-5ce001b0e56638c726270d4f9e05d46d4250dfbb.tar.xz linux-dev-5ce001b0e56638c726270d4f9e05d46d4250dfbb.zip | |
Merge branch 'linus' into stackprotector
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 1f524df68b96..0c5dcee23bb1 100644 --- 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. |