diff --git a/[refs] b/[refs] index 2013fc09ce52..858b3f82428d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17ebba1fe4da4b5d62782be8743e0e8231812af9 +refs/heads/master: 5e27fb78df95e027723af2c90ecc9b4527ae59e9 diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c index 92f5801f99c1..cbfb2edcf7d1 100644 --- a/trunk/arch/arm/mm/fault.c +++ b/trunk/arch/arm/mm/fault.c @@ -393,6 +393,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr, if (addr < TASK_SIZE) return do_page_fault(addr, fsr, regs); + if (user_mode(regs)) + goto bad_area; + index = pgd_index(addr); /*