[SCM] rtkit/master: Add a format string to dbus_message_new_error_printf

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Tue Feb 21 03:01:07 UTC 2017


The following commit has been merged in the master branch:
commit 5594f371aff655ce6d2f016b38e5cb2da7dec677
Author: Andrew Shadura <andrewsh at debian.org>
Date:   Mon Feb 20 23:59:12 2017 -0300

    Add a format string to dbus_message_new_error_printf
    
    Fixes an FTBFS due to -Werror=format-security
    
    Closes: #855605

diff --git a/debian/patches/0006-fix-format-strings.patch b/debian/patches/0006-fix-format-strings.patch
new file mode 100644
index 0000000..4214edd
--- /dev/null
+++ b/debian/patches/0006-fix-format-strings.patch
@@ -0,0 +1,68 @@
+From: Andrew Shadura <andrew.shadura at collabora.co.uk>
+Date: Mon, 20 Feb 2017 19:17:18 +0100
+Subject: Add a format string to dbus_message_new_error_printf (fixes an FTBFS
+ due to -Werror=format-security).
+Forwarded: no
+
+--- a/rtkit-daemon.c
++++ b/rtkit-daemon.c
+@@ -1333,7 +1333,7 @@
+                 int ret;
+ 
+                 if ((ret = verify_canary_refusal()) < 0) {
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+@@ -1358,17 +1358,17 @@
+ 
+                 if ((ret = lookup_client(&u, &p, &t, c, m, (pid_t)process, (pid_t) thread)) < 0) {
+                         syslog(LOG_DEBUG, "Failed to look up client: %s\n", strerror(-ret));
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+                 if ((ret = verify_polkit(c, u, p, "org.freedesktop.RealtimeKit1.acquire-real-time")) < 0) {
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+                 if ((ret = process_set_realtime(u, p, t, priority))) {
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+@@ -1385,7 +1385,7 @@
+                 int ret;
+ 
+                 if ((ret = verify_canary_refusal()) < 0) {
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+@@ -1410,17 +1410,17 @@
+ 
+                 if ((ret = lookup_client(&u, &p, &t, c, m, (pid_t)process, (pid_t) thread)) < 0) {
+                         syslog(LOG_DEBUG, "Failed to look up client: %s\n", strerror(-ret));
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+                 if ((ret = verify_polkit(c, u, p, "org.freedesktop.RealtimeKit1.acquire-high-priority")) < 0) {
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
+                 if ((ret = process_set_high_priority(u, p, t, priority))) {
+-                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), strerror(-ret)));
++                        assert_se(r = dbus_message_new_error_printf(m, translate_error_forward(ret), "%s", strerror(-ret)));
+                         goto finish;
+                 }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f53aacc..e298572 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-rtkit-test.patch
 0004-link-with-rt.patch
 0005-no-ptrace-cap.patch
+0006-fix-format-strings.patch

-- 
rtkit packaging



More information about the pkg-multimedia-commits mailing list