[valgrind] Add valgrind-3.9.0-format-security.patch

Mark Wielaard mjw at fedoraproject.org
Tue May 13 22:59:09 UTC 2014


commit af75891e83baa3ea202c4c873c4719be260f3cd3
Author: Mark Wielaard <mjw at redhat.com>
Date:   Wed May 14 00:58:40 2014 +0200

    Add valgrind-3.9.0-format-security.patch

 valgrind-3.9.0-format-security.patch |   13 +++++++++++++
 valgrind.spec                        |    5 +++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/valgrind-3.9.0-format-security.patch b/valgrind-3.9.0-format-security.patch
new file mode 100644
index 0000000..de298f7
--- /dev/null
+++ b/valgrind-3.9.0-format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/coregrind/m_gdbserver/remote-utils.c b/coregrind/m_gdbserver/remote-utils.c
+index d8dbe2a..b832d69 100644
+--- a/coregrind/m_gdbserver/remote-utils.c
++++ b/coregrind/m_gdbserver/remote-utils.c
+@@ -39,7 +39,7 @@
+ static
+ void sr_extended_perror (SysRes sr, const HChar *msg)
+ {
+-   sr_perror (sr, msg);
++   sr_perror (sr, "%s", msg);
+    if (VG_(clo_verbosity) > 0 || VG_(debugLog_getLevel)() >= 1) {
+       Int i;
+       vki_sigset_t cursigset;
diff --git a/valgrind.spec b/valgrind.spec
index b6d1e57..84c0200 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -60,6 +60,9 @@ Patch5: valgrind-3.9.0-s390x-ld-supp.patch
 # KDE#334705 - sendmsg and recvmsg should guard against bogus msghdr fields
 Patch6: valgrind-3.9.0-msghdr.patch
 
+# KDE#334727 - Build fails with -Werror=format-security
+Patch7: valgrind-3.9.0-format-security.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -165,6 +168,7 @@ Valgrind User Manual for details.
 %endif
 
 %patch6 -p1
+%patch7 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -328,6 +332,7 @@ echo ===============END TESTING===============
 - Update to upstream svn r13961.
 - Remove valgrind-3.9.0-mpx.patch integrated upstream now.
 - Add valgrind-3.9.0-msghdr.patch
+- Add valgrind-3.9.0-format-security.patch
 
 * Thu May 8 2014 Mark Wielaard <mjw at redhat.com> 3.9.0-12.svn20140319r13879
 - Add valgrind-3.9.0-mpx.patch (#1087933)


More information about the scm-commits mailing list