forked from Minki/linux
[POWERPC] PowerPC: Prevent data exception in kernel space (32-bit)
The "is_exec" branch of the protection check in do_page_fault() didn't do anything on 32-bit PowerPC. So if a userland program jumps to a page with Linux protection flags "---p", all the tests happily fall through, and handle_mm_fault() is called, which in turn calls handle_pte_fault(), which calls update_mmu_cache(), which goes flush the dcache to a page with no access rights. Boom. This fixes it. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
7c8545e984
commit
9ba4ace39f
@ -279,14 +279,13 @@ good_area:
|
|||||||
#endif /* CONFIG_8xx */
|
#endif /* CONFIG_8xx */
|
||||||
|
|
||||||
if (is_exec) {
|
if (is_exec) {
|
||||||
#ifdef CONFIG_PPC64
|
#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
|
||||||
/* protection fault */
|
/* protection fault */
|
||||||
if (error_code & DSISR_PROTFAULT)
|
if (error_code & DSISR_PROTFAULT)
|
||||||
goto bad_area;
|
goto bad_area;
|
||||||
if (!(vma->vm_flags & VM_EXEC))
|
if (!(vma->vm_flags & VM_EXEC))
|
||||||
goto bad_area;
|
goto bad_area;
|
||||||
#endif
|
#else
|
||||||
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
|
|
||||||
pte_t *ptep;
|
pte_t *ptep;
|
||||||
pmd_t *pmdp;
|
pmd_t *pmdp;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user