From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Mon, 18 May 2026 10:29:12 +0000 (+0200)
Subject: core/dbus-execute: propagate oom in property_get_cpu_affinity
X-Git-Tag: v261-rc1~116^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e305f552ec34be6df08abb1882707091b2b61479;p=thirdparty%2Fsystemd.git

core/dbus-execute: propagate oom in property_get_cpu_affinity

The function already returns errors, so I'm not sure why we ignored
the error in the second call, potentially leaving variables unitialized.
It seems easiest to propagate the error.

Reported by qarmin (Rafał Mikrut).
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 906002570f1..4d86c07a41a 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -123,19 +123,20 @@ static int property_get_cpu_affinity(
         _cleanup_(cpu_set_done) CPUSet s = {};
         _cleanup_free_ uint8_t *array = NULL;
         size_t allocated;
+        int r;
 
         assert(bus);
         assert(reply);
 
         if (c->cpu_affinity_from_numa) {
-                int r;
-
                 r = numa_to_cpu_set(&c->numa_policy, &s);
                 if (r < 0)
                         return r;
         }
 
-        (void) cpu_set_to_dbus(c->cpu_affinity_from_numa ? &s : &c->cpu_set,  &array, &allocated);
+        r = cpu_set_to_dbus(c->cpu_affinity_from_numa ? &s : &c->cpu_set, &array, &allocated);
+        if (r < 0)
+                return r;
 
         return sd_bus_message_append_array(reply, 'y', array, allocated);
 }