1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
|
From: Andrew Shadura <andrew.shadura@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;
}
|