diff options
| -rw-r--r-- | src/core/dbus-manager.c | 4 | ||||
| -rw-r--r-- | src/core/selinux-access.c | 1 | ||||
| -rw-r--r-- | src/shared/bus-polkit.c | 5 | ||||
| -rw-r--r-- | src/shared/bus-polkit.h | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 7a969ce6c1..70aecc8ede 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1405,11 +1405,11 @@ static int dump_impl( * operations, and can cause PID1 to stall. So it seems similar enough in terms of security * considerations and impact, and thus use the same access check for dumps which, given the * large amount of data to fetch, can stall PID1 for quite some time. */ - r = mac_selinux_access_check(message, "reload", error); + r = mac_selinux_access_check(message, "reload", /* error = */ NULL); if (r < 0) goto ratelimited; - r = bus_verify_bypass_dump_ratelimit_async(m, message, error); + r = bus_verify_bypass_dump_ratelimit_async(m, message, /* error = */ NULL); if (r < 0) goto ratelimited; if (r == 0) diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c index 1214bd8f22..8ce2d4e5a5 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -193,7 +193,6 @@ int mac_selinux_access_check_internal( assert(message); assert(permission); assert(function); - assert(error); r = access_init(error); if (r <= 0) diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c index c0752b59bb..0382d0b798 100644 --- a/src/shared/bus-polkit.c +++ b/src/shared/bus-polkit.c @@ -529,14 +529,13 @@ int bus_verify_polkit_async_full( uid_t good_user, PolkitFlags flags, Hashmap **registry, - sd_bus_error *ret_error) { + sd_bus_error *error) { int r; assert(call); assert(action); assert(registry); - assert(ret_error); log_debug("Trying to acquire polkit authentication for '%s'.", action); @@ -551,7 +550,7 @@ int bus_verify_polkit_async_full( /* This is a repeated invocation of this function, hence let's check if we've already got * a response from polkit for this action */ if (q) { - r = async_polkit_query_check_action(q, action, details, flags, ret_error); + r = async_polkit_query_check_action(q, action, details, flags, error); if (r != 0) { log_debug("Found matching previous polkit authentication for '%s'.", action); return r; diff --git a/src/shared/bus-polkit.h b/src/shared/bus-polkit.h index 15c621dfa3..f3741b2822 100644 --- a/src/shared/bus-polkit.h +++ b/src/shared/bus-polkit.h @@ -16,8 +16,8 @@ typedef enum PolkitFLags { int bus_test_polkit(sd_bus_message *call, const char *action, const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e); int bus_verify_polkit_async_full(sd_bus_message *call, const char *action, const char **details, uid_t good_user, PolkitFlags flags, Hashmap **registry, sd_bus_error *error); -static inline int bus_verify_polkit_async(sd_bus_message *call, const char *action, const char **details, Hashmap **registry, sd_bus_error *ret_error) { - return bus_verify_polkit_async_full(call, action, details, UID_INVALID, 0, registry, ret_error); +static inline int bus_verify_polkit_async(sd_bus_message *call, const char *action, const char **details, Hashmap **registry, sd_bus_error *error) { + return bus_verify_polkit_async_full(call, action, details, UID_INVALID, 0, registry, error); } int varlink_verify_polkit_async_full(Varlink *link, sd_bus *bus, const char *action, const char **details, uid_t good_user, PolkitFlags flags, Hashmap **registry); |