From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 25 Aug 2025 18:08:01 +0000 (+0200)
Subject: nspawn: the second time on_orderly_shutdown() is called userdata is NULL (#38709)
X-Git-Tag: v258-rc4~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce3b12713be0c4a08bef37f8be0606306fd20371;p=thirdparty%2Fsystemd.git

nspawn: the second time on_orderly_shutdown() is called userdata is NULL (#38709)

We know that it is, because we set it to NULL in the very same
on_orderly_shutdown() call.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index cbe75223e40..1142bc57458 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2959,7 +2959,7 @@ static int wait_for_container(PidRef *pid, ContainerStatus *container) {
 }
 
 static int on_orderly_shutdown(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
-        PidRef *pid = ASSERT_PTR(userdata);
+        PidRef *pid = userdata;
 
         assert(si);