From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Aug 2023 08:51:40 +0000 (+0200)
Subject: polkit: move asserts up, so that they cover all reply codepaths
X-Git-Tag: v255-rc1~773^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F28736%2Fhead;p=thirdparty%2Fsystemd.git

polkit: move asserts up, so that they cover all reply codepaths
---

diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c
index 383ebd9edef..0ae0073a821 100644
--- a/src/shared/bus-polkit.c
+++ b/src/shared/bus-polkit.c
@@ -253,6 +253,11 @@ static int async_polkit_read_reply(sd_bus_message *reply, AsyncPolkitQuery *q) {
         assert(reply);
         assert(q);
 
+        /* Processing of a PolicyKit checks is canceled on the first auth. error. */
+        assert(!q->denied_action);
+        assert(!q->error_action);
+        assert(!sd_bus_error_is_set(&q->error));
+
         assert(q->action);
         a = TAKE_PTR(q->action);
 
@@ -270,7 +275,6 @@ static int async_polkit_read_reply(sd_bus_message *reply, AsyncPolkitQuery *q) {
 
                 /* Treat no PK available as access denied */
                 q->denied_action = TAKE_PTR(a);
-
                 return 0;
         }
 
@@ -280,12 +284,6 @@ static int async_polkit_read_reply(sd_bus_message *reply, AsyncPolkitQuery *q) {
         if (r < 0)
                 return r;
 
-        /* It's currently expected that processing of a DBus message shall be interrupted on the first
-         * auth. error */
-        assert(!q->denied_action);
-        assert(!q->error_action);
-        assert(!sd_bus_error_is_set(&q->error));
-
         if (authorized)
                 LIST_PREPEND(authorized, q->authorized_actions, TAKE_PTR(a));
         else if (challenge) {