Adjust Valgrind suppressions for glibc

1 files changed, 34 insertions, 7 deletions

diff --git a/tools/telepathy-glib.supp b/tools/telepathy-glib.supp
index 6e51e6d96..a2a075ccd 100644
--- a/tools/telepathy-glib.supp
+++ b/tools/telepathy-glib.supp
@@ -22,14 +22,29 @@
    fun:tp_handle_ensure
 }
 
+# default.supp has these for 2.10, but they're too specific
 {
-   ld.so initialization on glibc 2.9
+   Debian libc6 (2.10.x, 2.11.x) stripped dynamic linker
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+   fun:_dl_sysdep_start
+   fun:_dl_start
+   obj:/lib/ld-*.so
+}
+{
+   Debian libc6 (2.9.x - 2.11.x) stripped dynamic linker
    Memcheck:Cond
    fun:_dl_relocate_object
    fun:dl_main
    fun:_dl_sysdep_start
    fun:_dl_start
-   obj:/lib/ld-2.9.so
+   obj:/lib/ld-*.so
 }
 
 {
@@ -43,12 +58,24 @@
    obj:/lib/ld-2.9.so
 }
 
+# ======================= libselinux on Debian amd64 =====================
+
+{
+   I have no idea what SELinux is doing but it's not my problem
+   Memcheck:Cond
+   ...
+   obj:/lib/libselinux.so.1
+   obj:/lib/libselinux.so.1
+   obj:/lib/libselinux.so.1
+}
+
 {
-  selinux, we just don't know
-  Memcheck:Leak
-  fun:malloc
-  fun:getdelim
-  obj:/lib/libselinux.so.1
+   I have no idea what SELinux is doing but it's not my problem
+   Memcheck:Value8
+   ...
+   obj:/lib/libselinux.so.1
+   obj:/lib/libselinux.so.1
+   obj:/lib/libselinux.so.1
 }
 
 # ============================= GLib ==================================