From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Nov 2024 23:04:43 +0000 (+0100)
Subject: nspawn: improve log message on bad incoming sd_notify() message
X-Git-Tag: v256.9~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95c20d0b627654626924eadaf65bc1825bb38701;p=thirdparty%2Fsystemd.git

nspawn: improve log message on bad incoming sd_notify() message

It's the PID that is wrong, not the UID/GID, be precise.

(cherry picked from commit 95116bdfd5d45cc1a7c6588e6b8bdcb0d0e007a6)
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a8d2c8a3a43..4e15112addf 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4538,7 +4538,7 @@ static int nspawn_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t r
 
         ucred = CMSG_FIND_DATA(&msghdr, SOL_SOCKET, SCM_CREDENTIALS, struct ucred);
         if (!ucred || ucred->pid != inner_child_pid) {
-                log_debug("Received notify message without valid credentials. Ignoring.");
+                log_debug("Received notify message from process that is not the payload's PID 1. Ignoring.");
                 return 0;
         }