summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2010-08-09 10:27:23 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2010-08-09 10:32:47 +0100
commit37a3fd7b9934ce938ad86b0ac21a6a4cd377f0f8 (patch)
tree6670258e8b61ddf2a83ccaa3a83698cabe182bf6 /arch
parent770aa9f0d2978bce98daf15644298802987a6642 (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. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/flush.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 2332b774c6b..03a4934a167 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -119,8 +119,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();
if (cache_ops_need_broadcast())
smp_call_function(flush_ptrace_access_other,
NULL, 1);