From 7ddbacbaa5963a62e504ea93672d7b02befbfc64 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Aug 2023 10:51:40 +0200 Subject: [PATCH] polkit: move asserts up, so that they cover all reply codepaths (cherry picked from commit c1b2e1a89a54dc5ec51f5f1c6257a2956782b296) --- src/shared/bus-polkit.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c index b7f7c2b47a..27e506da16 100644 --- a/src/shared/bus-polkit.c +++ b/src/shared/bus-polkit.c @@ -255,6 +255,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); @@ -272,7 +277,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; } @@ -282,12 +286,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) {