349828 memcpy intercepts memmove causing src/dst overlap error (ppc64 ld.so)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15397

diff --git a/NEWS b/NEWS
index 85e75299fce8e1335002cf76ddeb362a54c78e30..48fe21c82a97ffe6666563f532988841cbd426d9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -249,6 +249,7 @@ where XXXXXX is the bug number as listed below.
         reply 0x........] (task_set_special_port)
 349626  Implemented additional Xen hypercalls
 349874  Fix typos in source code
+349828  memcpy intercepts memmove causing src/dst overlap error (ppc64 ld.so)
 n-i-bz  Provide implementations of certain compiler builtins to support
         compilers who may not provide those
 n-i-bz  Old STABS code is still being compiled, but never used. Remove it.

diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index d4e54492df4ae99fdd0c5eb31229def258ecb340..0f366bf1c1b80808b5c8a2d62810073b57267c23 100644 (file)
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -1141,6 +1141,10 @@ static inline void my_exit ( int x )
 #if defined(VGO_linux)
  MEMMOVE(VG_Z_LIBC_SONAME, memmove)
  MEMMOVE(VG_Z_LIBC_SONAME, __GI_memmove)
+ /* See bug #349828 Override for ld64.so.1 like memcpy, because for some
+    arches MEMCPY_OK_FOR_FORWARD_MEMMOVE is set, which might cause memmove
+    to call memcpy.  */
+ MEMMOVE(VG_Z_LD64_SO_1, memmove)
 
 #elif defined(VGO_darwin)
 # if DARWIN_VERS <= DARWIN_10_6