From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 8 Dec 2020 14:07:29 +0000 (+0100)
Subject: Bug 408663 - Patch: Suppression file for musl libc
X-Git-Tag: VALGRIND_3_17_0~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4d98ff79d5a79102b777ea7e23002d9f7326489;p=thirdparty%2Fvalgrind.git

Bug 408663 - Patch: Suppression file for musl libc
---

diff --git a/NEWS b/NEWS
index db750e081a..cf403ab24c 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,7 @@ n-i-bz  helgrind: If hg_cli__realloc fails, return NULL.
 428909  helgrind: need to intercept duplicate libc definitions for Fedora 33
 429864  s390x: C++ atomic test_and_set yields false-positive memcheck
         diagnostics
+408663  Suppression file for musl libc 
 
 Release 3.16.1 (?? June 2020)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/configure.ac b/configure.ac
index b837872918..2b949ed84e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1147,7 +1147,7 @@ case "${GLIBC_VERSION}" in
      musl)
 	AC_MSG_RESULT(Musl)
 	AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
-	# no DEFAULT_SUPP file yet for musl libc.
+	DEFAULT_SUPP="musl.supp ${DEFAULT_SUPP}"
 	;;
      2.0|2.1|*)
 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
diff --git a/musl.supp b/musl.supp
new file mode 100644
index 0000000000..864172a242
--- /dev/null
+++ b/musl.supp
@@ -0,0 +1,46 @@
+# Suppressions for musl libc
+# See: https://www.openwall.com/lists/musl/2017/06/15/4
+
+{
+   musl-dynlink-false-positive1
+   Memcheck:Leak
+   fun:calloc
+   fun:load_direct_deps
+   fun:load_deps
+   fun:load_deps
+   fun:__dls3
+   fun:__dls2b
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive2
+   Memcheck:Leak
+   fun:calloc
+   fun:load_direct_deps
+   fun:load_deps
+   fun:load_deps
+   fun:__dls3
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive3
+   Memcheck:Leak
+   fun:calloc
+   fun:load_library
+   fun:load_preload
+   fun:__dls3
+   fun:__dls2b
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive4
+   Memcheck:Leak
+   fun:calloc
+   fun:load_library
+   fun:load_preload
+   fun:__dls3
+   fun:__dls2
+}