CentOS Sources
2 years ago
committed by
MSVSphere Packaging Team
commit
8b94b18521
@ -0,0 +1 @@
|
|||||||
|
SOURCES/valgrind-3.19.0.tar.bz2
|
||||||
@ -0,0 +1 @@
|
|||||||
|
294c341b421b4d9534e42e8125f509c148f48c17 SOURCES/valgrind-3.19.0.tar.bz2
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
commit d3c977726064ba09fed6dfc7daf22b16824c97b4
|
||||||
|
Author: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Fri May 24 18:24:56 2019 +0200
|
||||||
|
|
||||||
|
Add -Wl,-z,now to some binaries.
|
||||||
|
|
||||||
|
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
|
||||||
|
index 1b7842b..e211eec 100644
|
||||||
|
--- a/auxprogs/Makefile.am
|
||||||
|
+++ b/auxprogs/Makefile.am
|
||||||
|
@@ -32,7 +32,7 @@ valgrind_listener_SOURCES = valgrind-listener.c
|
||||||
|
valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI) -Wl,-z,now
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
valgrind_listener_CFLAGS += -static
|
||||||
|
endif
|
||||||
|
@@ -51,7 +51,7 @@ valgrind_di_server_SOURCES = valgrind-di-server.c
|
||||||
|
valgrind_di_server_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_di_server_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-valgrind_di_server_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_di_server_LDFLAGS = $(AM_CFLAGS_PRI) -Wl,-z,now
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
valgrind_di_server_CFLAGS += -static
|
||||||
|
endif
|
||||||
|
@@ -86,7 +86,7 @@ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = getoff.c
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fstack-protector-strong
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
+getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
|
||||||
|
if HAVE_DLINFO_RTLD_DI_TLS_MODID
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
|
||||||
|
endif
|
||||||
|
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
|
||||||
|
index f572741..1c07e50 100644
|
||||||
|
--- a/cachegrind/Makefile.am
|
||||||
|
+++ b/cachegrind/Makefile.am
|
||||||
|
@@ -27,7 +27,7 @@ cg_merge_SOURCES = cg_merge.c
|
||||||
|
cg_merge_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
cg_merge_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-cg_merge_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+cg_merge_LDFLAGS = $(AM_CFLAGS_PRI) -Wl,-z,now
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
# then the primary platform must be x86-darwin. Hence:
|
||||||
|
if ! VGCONF_HAVE_PLATFORM_SEC
|
||||||
|
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
|
||||||
|
index 3c73210..fb6b7bb 100644
|
||||||
|
--- a/coregrind/Makefile.am
|
||||||
|
+++ b/coregrind/Makefile.am
|
||||||
|
@@ -57,7 +57,7 @@ RANLIB = ${LTO_RANLIB}
|
||||||
|
valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-valgrind_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
+valgrind_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
# then the primary platform must be x86-darwin. Hence:
|
||||||
|
if ! VGCONF_HAVE_PLATFORM_SEC
|
||||||
|
@@ -96,7 +96,7 @@ endif
|
||||||
|
vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
+vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
vgdb_CFLAGS += -static
|
||||||
|
endif
|
||||||
@ -0,0 +1,118 @@
|
|||||||
|
commit b73fb7a614e1b5d60af23fb0752b5cead995e02e
|
||||||
|
Author: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Sun Apr 14 00:30:05 2019 +0200
|
||||||
|
|
||||||
|
Remove no-stack-protector, add stack-protector-strong to some.
|
||||||
|
|
||||||
|
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
|
||||||
|
index 56cc5ef..1b7842b 100644
|
||||||
|
--- a/auxprogs/Makefile.am
|
||||||
|
+++ b/auxprogs/Makefile.am
|
||||||
|
@@ -30,7 +30,7 @@ bin_PROGRAMS = valgrind-listener valgrind-di-server
|
||||||
|
|
||||||
|
valgrind_listener_SOURCES = valgrind-listener.c
|
||||||
|
valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
-valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
@@ -49,7 +49,7 @@ endif
|
||||||
|
|
||||||
|
valgrind_di_server_SOURCES = valgrind-di-server.c
|
||||||
|
valgrind_di_server_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
-valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_di_server_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
valgrind_di_server_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
@@ -84,7 +84,7 @@ endif
|
||||||
|
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = getoff.c
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
|
||||||
|
-getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
|
||||||
|
+getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fstack-protector-strong
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
if HAVE_DLINFO_RTLD_DI_TLS_MODID
|
||||||
|
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
|
||||||
|
index f8447a1..f572741 100644
|
||||||
|
--- a/cachegrind/Makefile.am
|
||||||
|
+++ b/cachegrind/Makefile.am
|
||||||
|
@@ -25,7 +25,7 @@ bin_PROGRAMS = cg_merge
|
||||||
|
|
||||||
|
cg_merge_SOURCES = cg_merge.c
|
||||||
|
cg_merge_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
-cg_merge_CFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+cg_merge_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
cg_merge_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index f8c798b..ccc8f52 100755
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -2352,24 +2352,24 @@
|
||||||
|
AM_CONDITIONAL([HAVE_ALIGNED_CXX_ALLOC], [test x$ac_have_aligned_cxx_alloc = xyes])
|
||||||
|
|
||||||
|
# does this compiler support -fno-stack-protector ?
|
||||||
|
-AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
|
||||||
|
-
|
||||||
|
-safe_CFLAGS=$CFLAGS
|
||||||
|
-CFLAGS="-fno-stack-protector -Werror"
|
||||||
|
-
|
||||||
|
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
|
||||||
|
- return 0;
|
||||||
|
-]])], [
|
||||||
|
-no_stack_protector=yes
|
||||||
|
-FLAG_FNO_STACK_PROTECTOR="-fno-stack-protector"
|
||||||
|
-AC_MSG_RESULT([yes])
|
||||||
|
-], [
|
||||||
|
-no_stack_protector=no
|
||||||
|
+#AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
|
||||||
|
+#
|
||||||
|
+#safe_CFLAGS=$CFLAGS
|
||||||
|
+#CFLAGS="-fno-stack-protector -Werror"
|
||||||
|
+#
|
||||||
|
+#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
|
||||||
|
+# return 0;
|
||||||
|
+#]])], [
|
||||||
|
+#no_stack_protector=yes
|
||||||
|
+#FLAG_FNO_STACK_PROTECTOR="-fno-stack-protector"
|
||||||
|
+#AC_MSG_RESULT([yes])
|
||||||
|
+#], [
|
||||||
|
+#no_stack_protector=no
|
||||||
|
FLAG_FNO_STACK_PROTECTOR=""
|
||||||
|
-AC_MSG_RESULT([no])
|
||||||
|
-])
|
||||||
|
-CFLAGS=$safe_CFLAGS
|
||||||
|
-
|
||||||
|
+#AC_MSG_RESULT([no])
|
||||||
|
+#])
|
||||||
|
+#CFLAGS=$safe_CFLAGS
|
||||||
|
+#
|
||||||
|
AC_SUBST(FLAG_FNO_STACK_PROTECTOR)
|
||||||
|
|
||||||
|
# does this compiler support -finline-functions ?
|
||||||
|
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
|
||||||
|
index 94030fd..3c73210 100644
|
||||||
|
--- a/coregrind/Makefile.am
|
||||||
|
+++ b/coregrind/Makefile.am
|
||||||
|
@@ -55,7 +55,7 @@ AR = ${LTO_AR}
|
||||||
|
RANLIB = ${LTO_RANLIB}
|
||||||
|
|
||||||
|
valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
-valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
|
||||||
|
+valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
valgrind_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
@@ -94,7 +94,7 @@ vgdb_SOURCES += vgdb-invoker-solaris.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
-vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
|
||||||
|
+vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
commit 947388eb043ea1c44b37df94046e1eee790ad776
|
||||||
|
Author: Mike Crowe <mac@mcrowe.com>
|
||||||
|
Date: Mon Sep 9 14:16:16 2019 +0100
|
||||||
|
|
||||||
|
Intercept strncmp for glibc ld.so v2.28+
|
||||||
|
|
||||||
|
In glibc 5aad5f617892e75d91d4c8fb7594ff35b610c042 (first released in
|
||||||
|
v2.28) a call to strncmp was added to dl-load.c:is_dst. This causes
|
||||||
|
valgrind to complain about glibc's highly-optimised strncmp performing
|
||||||
|
sixteen-byte reads on short strings in ld.so. Let's intercept strncmp in
|
||||||
|
ld.so too so we use valgrind's simple version to avoid this problem.
|
||||||
|
|
||||||
|
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
|
||||||
|
index 3b42b3a87..5396e83be 100644
|
||||||
|
--- a/shared/vg_replace_strmem.c
|
||||||
|
+++ b/shared/vg_replace_strmem.c
|
||||||
|
@@ -710,6 +710,8 @@ static inline void my_exit ( int x )
|
||||||
|
STRNCMP(VG_Z_LIBC_SONAME, __GI_strncmp)
|
||||||
|
STRNCMP(VG_Z_LIBC_SONAME, __strncmp_sse2)
|
||||||
|
STRNCMP(VG_Z_LIBC_SONAME, __strncmp_sse42)
|
||||||
|
+ STRNCMP(VG_Z_LD_LINUX_SO_2, strncmp)
|
||||||
|
+ STRNCMP(VG_Z_LD_LINUX_X86_64_SO_2, strncmp)
|
||||||
|
|
||||||
|
#elif defined(VGO_freebsd)
|
||||||
|
STRNCMP(VG_Z_LIBC_SONAME, strncmp)
|
||||||
@ -0,0 +1,231 @@
|
|||||||
|
From 42ca1c480a5bca408a54c6a24d2be2c081d121ac Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Arnez <arnez@linux.ibm.com>
|
||||||
|
Date: Thu, 19 May 2022 13:54:06 +0200
|
||||||
|
Subject: [PATCH] Bug 454040 - Add intercept for memmem on s390x
|
||||||
|
|
||||||
|
Since memcheck may report false positives in an optimized version of memmem on
|
||||||
|
s390x, add an intercept for memmem on s390x platforms.
|
||||||
|
---
|
||||||
|
shared/vg_replace_strmem.c | 36 ++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 36 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
|
||||||
|
index 5396e83be..d28e74206 100644
|
||||||
|
--- a/shared/vg_replace_strmem.c
|
||||||
|
+++ b/shared/vg_replace_strmem.c
|
||||||
|
@@ -103,6 +103,7 @@
|
||||||
|
20430 WMEMCHR
|
||||||
|
20440 WCSNLEN
|
||||||
|
20450 WSTRNCMP
|
||||||
|
+ 20460 MEMMEM
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if defined(VGO_solaris)
|
||||||
|
@@ -1785,6 +1786,41 @@ static inline void my_exit ( int x )
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+/*---------------------- memmem ----------------------*/
|
||||||
|
+
|
||||||
|
+#define MEMMEM(soname, fnname) \
|
||||||
|
+ void* VG_REPLACE_FUNCTION_EZU(20460,soname,fnname) \
|
||||||
|
+ (const void* haystack, SizeT hlen, const void* needle, SizeT nlen); \
|
||||||
|
+ void* VG_REPLACE_FUNCTION_EZU(20460,soname,fnname) \
|
||||||
|
+ (const void* haystack, SizeT hlen, const void* needle, SizeT nlen) \
|
||||||
|
+ { \
|
||||||
|
+ const HChar* h = haystack; \
|
||||||
|
+ const HChar* n = needle; \
|
||||||
|
+ \
|
||||||
|
+ /* If the needle is the empty string, match immediately. */ \
|
||||||
|
+ if (nlen == 0) return CONST_CAST(void *,h); \
|
||||||
|
+ \
|
||||||
|
+ HChar n0 = n[0]; \
|
||||||
|
+ \
|
||||||
|
+ for (; hlen >= nlen; hlen--, h++) { \
|
||||||
|
+ if (h[0] != n0) continue; \
|
||||||
|
+ \
|
||||||
|
+ UWord i; \
|
||||||
|
+ for (i = 1; i < nlen; i++) { \
|
||||||
|
+ if (n[i] != h[i]) \
|
||||||
|
+ break; \
|
||||||
|
+ } \
|
||||||
|
+ if (i == nlen) \
|
||||||
|
+ return CONST_CAST(HChar *,h); \
|
||||||
|
+ \
|
||||||
|
+ } \
|
||||||
|
+ return NULL; \
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#if defined(VGP_s390x_linux)
|
||||||
|
+ MEMMEM(VG_Z_LIBC_SONAME, memmem)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
|
||||||
|
/*---------------------- strpbrk ----------------------*/
|
||||||
|
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
|
From 4d675f309bcd2d4e9e2b9e6f4aba30f85116bb9b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Thu, 19 May 2022 18:08:40 -0400
|
||||||
|
Subject: [PATCH] Add memmem memcheck tests
|
||||||
|
|
||||||
|
---
|
||||||
|
memcheck/tests/Makefile.am | 3 ++
|
||||||
|
memcheck/tests/filter_memmem | 5 ++
|
||||||
|
memcheck/tests/memmem.c | 81 ++++++++++++++++++++++++++++++++
|
||||||
|
memcheck/tests/memmem.stderr.exp | 2 +
|
||||||
|
memcheck/tests/memmem.vgtest | 3 ++
|
||||||
|
5 files changed, 94 insertions(+)
|
||||||
|
create mode 100755 memcheck/tests/filter_memmem
|
||||||
|
create mode 100644 memcheck/tests/memmem.c
|
||||||
|
create mode 100644 memcheck/tests/memmem.stderr.exp
|
||||||
|
create mode 100644 memcheck/tests/memmem.vgtest
|
||||||
|
|
||||||
|
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
|
||||||
|
index eb9487272..4d181c1ac 100644
|
||||||
|
--- a/memcheck/tests/Makefile.am
|
||||||
|
+++ b/memcheck/tests/Makefile.am
|
||||||
|
@@ -79,6 +79,7 @@ dist_noinst_SCRIPTS = \
|
||||||
|
filter_strchr \
|
||||||
|
filter_varinfo3 \
|
||||||
|
filter_memcheck \
|
||||||
|
+ filter_memmem \
|
||||||
|
filter_overlaperror \
|
||||||
|
filter_malloc_free \
|
||||||
|
filter_sized_delete
|
||||||
|
@@ -220,6 +221,7 @@ EXTRA_DIST = \
|
||||||
|
memalign2.stderr.exp memalign2.vgtest \
|
||||||
|
memcmptest.stderr.exp memcmptest.stderr.exp2 \
|
||||||
|
memcmptest.stdout.exp memcmptest.vgtest \
|
||||||
|
+ memmem.stderr.exp memmem.vgtest \
|
||||||
|
mempool.stderr.exp mempool.vgtest \
|
||||||
|
mempool2.stderr.exp mempool2.vgtest \
|
||||||
|
metadata.stderr.exp metadata.stdout.exp metadata.vgtest \
|
||||||
|
@@ -417,6 +419,7 @@ check_PROGRAMS = \
|
||||||
|
malloc_usable malloc1 malloc2 malloc3 manuel1 manuel2 manuel3 \
|
||||||
|
match-overrun \
|
||||||
|
memalign_test memalign2 memcmptest mempool mempool2 mmaptest \
|
||||||
|
+ memmem \
|
||||||
|
mismatches new_override metadata \
|
||||||
|
nanoleak_supp nanoleak2 new_nothrow \
|
||||||
|
noisy_child \
|
||||||
|
diff --git a/memcheck/tests/filter_memmem b/memcheck/tests/filter_memmem
|
||||||
|
new file mode 100755
|
||||||
|
index 000000000..f4a40b2d1
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/memcheck/tests/filter_memmem
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+#! /bin/sh
|
||||||
|
+
|
||||||
|
+# Too many memmem implementations and overrides.
|
||||||
|
+# So just keep the main file lines.
|
||||||
|
+./filter_stderr "$@" | grep " main (memmem.c:"
|
||||||
|
diff --git a/memcheck/tests/memmem.c b/memcheck/tests/memmem.c
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..d627076e3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/memcheck/tests/memmem.c
|
||||||
|
@@ -0,0 +1,81 @@
|
||||||
|
+#define _GNU_SOURCE
|
||||||
|
+#include <assert.h>
|
||||||
|
+#include <string.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+
|
||||||
|
+/* mallocs an mem block and fills it with A. A needs to be a zero
|
||||||
|
+ terminated string. The A string chars, minus the terminating zero
|
||||||
|
+ are copied into the returned mem block. */
|
||||||
|
+static void *
|
||||||
|
+create_mem (const char *a)
|
||||||
|
+{
|
||||||
|
+ size_t len = strlen (a);
|
||||||
|
+ void *mem = malloc (len);
|
||||||
|
+ memcpy (mem, a, len);
|
||||||
|
+ return mem;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+main ()
|
||||||
|
+{
|
||||||
|
+ char *haystack;
|
||||||
|
+ char *needle;
|
||||||
|
+
|
||||||
|
+ haystack = create_mem ("a");
|
||||||
|
+ needle = create_mem ("a");
|
||||||
|
+ assert (memmem (haystack, 0, needle, 0) == haystack);
|
||||||
|
+ assert (memmem (haystack, 1, needle, 0) == haystack);
|
||||||
|
+ assert (memmem (haystack, 0, needle, 1) == NULL);
|
||||||
|
+ assert (memmem (haystack, 1, needle, 1) == haystack);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ haystack = create_mem ("abc");
|
||||||
|
+ needle = create_mem ("bc");
|
||||||
|
+ assert (memmem (haystack, 3, needle, 0) == haystack);
|
||||||
|
+ assert (memmem (haystack, 3, needle, 2) == haystack + 1);
|
||||||
|
+ assert (memmem (haystack + 1, 2, needle, 2) == haystack + 1);
|
||||||
|
+ assert (memmem (haystack + 2, 1, needle, 2) == NULL);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ haystack = create_mem ("abcabcabc");
|
||||||
|
+ needle = create_mem ("bca");
|
||||||
|
+ assert (memmem (haystack, 9, needle, 3) == haystack + 1);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ haystack = create_mem ("abcabcabc");
|
||||||
|
+ needle = create_mem ("bcad");
|
||||||
|
+ assert (memmem (haystack, 9, needle, 4) == NULL);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ haystack = create_mem ("xxxxxxxxxxxxxxxxxABC");
|
||||||
|
+ needle = create_mem ("ABCD");
|
||||||
|
+ assert (memmem (haystack, 20, needle, 2) == haystack + 17);
|
||||||
|
+ assert (memmem (haystack + 3, 17, needle, 2) == haystack + 17);
|
||||||
|
+ assert (memmem (haystack + 15, 5, needle, 2) == haystack + 17);
|
||||||
|
+ assert (memmem (haystack, 20, needle, 3) == haystack + 17);
|
||||||
|
+ assert (memmem (haystack + 3, 17, needle, 3) == haystack + 17);
|
||||||
|
+ assert (memmem (haystack + 15, 5, needle, 3) == haystack + 17);
|
||||||
|
+ assert (memmem (haystack, 20, needle, 4) == NULL);
|
||||||
|
+ assert (memmem (haystack + 3, 5, needle, 4) == NULL);
|
||||||
|
+ assert (memmem (haystack + 15, 5, needle, 4) == NULL);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ haystack = malloc (1);
|
||||||
|
+ needle = create_mem ("a");
|
||||||
|
+ assert (memmem (haystack, 1, needle, 1) == NULL);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ haystack = create_mem ("A");
|
||||||
|
+ needle = malloc (1);
|
||||||
|
+ assert (memmem (haystack, 1, needle, 1) == NULL);
|
||||||
|
+ free (haystack);
|
||||||
|
+ free (needle);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/memcheck/tests/memmem.stderr.exp b/memcheck/tests/memmem.stderr.exp
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..b4612fbd4
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/memcheck/tests/memmem.stderr.exp
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+ by 0x........: main (memmem.c:70)
|
||||||
|
+ by 0x........: main (memmem.c:76)
|
||||||
|
diff --git a/memcheck/tests/memmem.vgtest b/memcheck/tests/memmem.vgtest
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..6d12895df
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/memcheck/tests/memmem.vgtest
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+prog: memmem
|
||||||
|
+vgopts: -q
|
||||||
|
+stderr_filter: filter_memmem
|
||||||
|
--
|
||||||
|
2.18.4
|
||||||
|
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
--- valgrind-3.8.1/cachegrind/cg_sim.c.jj 2011-10-26 23:24:32.000000000 +0200
|
||||||
|
+++ valgrind-3.8.1/cachegrind/cg_sim.c 2011-12-09 17:31:19.256023683 +0100
|
||||||
|
@@ -42,27 +42,30 @@ typedef struct {
|
||||||
|
Int size; /* bytes */
|
||||||
|
Int assoc;
|
||||||
|
Int line_size; /* bytes */
|
||||||
|
- Int sets;
|
||||||
|
Int sets_min_1;
|
||||||
|
Int line_size_bits;
|
||||||
|
Int tag_shift;
|
||||||
|
- HChar desc_line[128]; /* large enough */
|
||||||
|
UWord* tags;
|
||||||
|
-} cache_t2;
|
||||||
|
+ HChar desc_line[128];
|
||||||
|
+} cache_t2
|
||||||
|
+#ifdef __GNUC__
|
||||||
|
+__attribute__ ((aligned (8 * sizeof (Int))))
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
|
||||||
|
/* By this point, the size/assoc/line_size has been checked. */
|
||||||
|
static void cachesim_initcache(cache_t config, cache_t2* c)
|
||||||
|
{
|
||||||
|
- Int i;
|
||||||
|
+ Int sets;
|
||||||
|
|
||||||
|
c->size = config.size;
|
||||||
|
c->assoc = config.assoc;
|
||||||
|
c->line_size = config.line_size;
|
||||||
|
|
||||||
|
- c->sets = (c->size / c->line_size) / c->assoc;
|
||||||
|
- c->sets_min_1 = c->sets - 1;
|
||||||
|
+ sets = (c->size / c->line_size) / c->assoc;
|
||||||
|
+ c->sets_min_1 = sets - 1;
|
||||||
|
c->line_size_bits = VG_(log2)(c->line_size);
|
||||||
|
- c->tag_shift = c->line_size_bits + VG_(log2)(c->sets);
|
||||||
|
+ c->tag_shift = c->line_size_bits + VG_(log2)(sets);
|
||||||
|
|
||||||
|
if (c->assoc == 1) {
|
||||||
|
VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped",
|
||||||
|
@@ -72,11 +75,8 @@ static void cachesim_initcache(cache_t c
|
||||||
|
c->size, c->line_size, c->assoc);
|
||||||
|
}
|
||||||
|
|
||||||
|
- c->tags = VG_(malloc)("cg.sim.ci.1",
|
||||||
|
- sizeof(UWord) * c->sets * c->assoc);
|
||||||
|
-
|
||||||
|
- for (i = 0; i < c->sets * c->assoc; i++)
|
||||||
|
- c->tags[i] = 0;
|
||||||
|
+ c->tags = VG_(calloc)("cg.sim.ci.1",
|
||||||
|
+ sizeof(UWord), sets * c->assoc);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This attribute forces GCC to inline the function, getting rid of a
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
--- valgrind/glibc-2.X.supp.in.jj 2011-10-26 23:24:45.000000000 +0200
|
||||||
|
+++ valgrind/glibc-2.X.supp.in 2012-05-07 10:55:20.395942656 +0200
|
||||||
|
@@ -124,7 +124,7 @@
|
||||||
|
glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
|
||||||
|
Memcheck:Cond
|
||||||
|
fun:index
|
||||||
|
- obj:*ld-@GLIBC_VERSION@.*.so
|
||||||
|
+ obj:*ld-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
{
|
||||||
|
glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
|
||||||
|
@@ -136,14 +136,14 @@
|
||||||
|
glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
|
||||||
|
Memcheck:Addr4
|
||||||
|
fun:index
|
||||||
|
- obj:*ld-@GLIBC_VERSION@.*.so
|
||||||
|
+ obj:*ld-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
{
|
||||||
|
glibc-2.3.5-on-SuSE-10.1-(PPC)-3
|
||||||
|
Memcheck:Addr4
|
||||||
|
fun:*wordcopy_fwd_dest_aligned*
|
||||||
|
fun:mem*cpy
|
||||||
|
- obj:*lib*@GLIBC_VERSION@.*.so
|
||||||
|
+ obj:*lib*@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue