Fix ptrace aliasing issue in copy_from_user_page / copy_to_user_page.

[deliverable/linux.git] / include / asm-mips / cacheflush.h

diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h
index 635f1bfb403eca55410f208bbdd0c031e15a5a94..3780c9f9354aab6ace4c5ef126669ca070b16097 100644 (file)
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -55,11 +55,17 @@ extern void (*flush_icache_range)(unsigned long start, unsigned long end);
 
 #define copy_to_user_page(vma, page, vaddr, dst, src, len)             \
 do {                                                                   \
+       if (cpu_has_dc_aliases)                                         \
+               flush_cache_page(vma, vaddr);                           \
        memcpy(dst, (void *) src, len);                                 \
        flush_icache_page(vma, page);                                   \
 } while (0)
 #define copy_from_user_page(vma, page, vaddr, dst, src, len)           \
-       memcpy(dst, src, len)
+do {                                                                   \
+       if (cpu_has_dc_aliases)                                         \
+               flush_cache_page(vma, vaddr);                           \
+       memcpy(dst, src, len);                                          \
+} while (0)
 
 extern void (*flush_cache_sigtramp)(unsigned long addr);
 extern void (*flush_icache_all)(void);