From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 30 Oct 2024 14:19:12 +0000 (+0100)
Subject: sd-varlink: if we reply to errors without passing to callback, go through regular... 
X-Git-Tag: v257-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0118074f85482f70bbf3ee985bbb1d6690643be5;p=thirdparty%2Fsystemd.git

sd-varlink: if we reply to errors without passing to callback, go through regular error path

If replying with an error fails, we should failt the whole connection,
and not leave the connection in a weird state.
---

diff --git a/src/libsystemd/sd-varlink/sd-varlink.c b/src/libsystemd/sd-varlink/sd-varlink.c
index fb42e3205da..af3a3073543 100644
--- a/src/libsystemd/sd-varlink/sd-varlink.c
+++ b/src/libsystemd/sd-varlink/sd-varlink.c
@@ -1362,7 +1362,7 @@ static int varlink_dispatch_method(sd_varlink *v) {
                                 if (v->state == VARLINK_PROCESSING_METHOD) {
                                         r = sd_varlink_error(v, SD_VARLINK_ERROR_EXPECTED_MORE, NULL);
                                         if (r < 0)
-                                                return r;
+                                                goto fail;
                                 }
                         } else if (r < 0) {
                                 /* Please adjust test/units/end.sh when updating the log message. */
@@ -1372,7 +1372,7 @@ static int varlink_dispatch_method(sd_varlink *v) {
                                 if (IN_SET(v->state, VARLINK_PROCESSING_METHOD, VARLINK_PROCESSING_METHOD_MORE)) {
                                         r = sd_varlink_error_invalid_parameter_name(v, bad_field);
                                         if (r < 0)
-                                                return r;
+                                                goto fail;
                                 }
                         }
 
@@ -1388,14 +1388,14 @@ static int varlink_dispatch_method(sd_varlink *v) {
                                 if (IN_SET(v->state, VARLINK_PROCESSING_METHOD, VARLINK_PROCESSING_METHOD_MORE)) {
                                         r = sd_varlink_error_errno(v, r);
                                         if (r < 0)
-                                                return r;
+                                                goto fail;
                                 }
                         }
                 }
         } else if (IN_SET(v->state, VARLINK_PROCESSING_METHOD, VARLINK_PROCESSING_METHOD_MORE)) {
                 r = sd_varlink_errorbo(v, SD_VARLINK_ERROR_METHOD_NOT_FOUND, SD_JSON_BUILD_PAIR("method", SD_JSON_BUILD_STRING(method)));
                 if (r < 0)
-                        return r;
+                        goto fail;
         }
 
         switch (v->state) {