diff options
| author | Will Deacon <will.deacon@arm.com> | 2010-07-15 15:33:51 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2010-08-02 11:04:48 +0100 |
| commit | cda96f7b07fcee122ae7c622e67d3be64274b390 (patch) | |
| tree | b7124d5ab69fac7ac433bba0078e80d971945090 /arch/arm/mm/flush.c | |
| parent | 7697b7ff6e0d728ed4ecc983628cba330998c376 (diff) | |
ARM: flush_ptrace_access: invalidate all I-caches
copy_to_user_page can be used by access_process_vm to write to an
executable page of a process using a mapping acquired by kmap.
For systems with I-cache aliasing, flushing the I-cache using the
Kernel mapping may leave stale data in the I-cache if the user
mapping is of a different colour.
This patch replaces the coherent_kern_range call in flush_ptrace_access
with a D-cache flush followed by a system-wide I-cache invalidation.
This is required on all systems where the size of a way in the I-cache
is larger than PAGE_SIZE.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/mm/flush.c')
| -rw-r--r-- | arch/arm/mm/flush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index c6844cb9b50..45896a91a12 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -120,8 +120,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, /* VIPT non-aliasing cache */ if (vma->vm_flags & VM_EXEC) { - unsigned long addr = (unsigned long)kaddr; - __cpuc_coherent_kern_range(addr, addr + len); + __cpuc_flush_dcache_area(kaddr, len); + __flush_icache_all(); #ifdef CONFIG_SMP if (cache_ops_need_broadcast()) smp_call_function(flush_ptrace_access_other, |