From c5855d9640e7fd91fdd8b2e3ebd2741fec0caef5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 1 Apr 2025 19:15:59 +0900 Subject: [PATCH] notify-recv: several follow-ups for notify_socket_prepare() Follow-ups for 2351bc991e3a4f1fbdaa2d53900980b6703babbd. Addresses post-merge review: https://github.com/systemd/systemd/pull/36911#pullrequestreview-2732136658 --- src/shared/notify-recv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/shared/notify-recv.c b/src/shared/notify-recv.c index 70f4bb8d5c2..8c5e711495f 100644 --- a/src/shared/notify-recv.c +++ b/src/shared/notify-recv.c @@ -17,6 +17,10 @@ int notify_socket_prepare( int r; assert(event); + assert(ret_path); + + /* This creates an autobind AF_UNIX socket and adds an IO event source for the socket, which helps + * prepare the notification socket used to communicate with worker processes. */ _cleanup_close_ int fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); if (fd < 0) @@ -34,7 +38,7 @@ int notify_socket_prepare( /* SO_PASSPIDFD is supported since kernel v6.5. */ r = setsockopt_int(fd, SOL_SOCKET, SO_PASSPIDFD, true); if (r < 0) - log_debug_errno(r, "Failed to enable SO_PASSPIDFD on notification socket, ignoring. %m"); + log_debug_errno(r, "Failed to enable SO_PASSPIDFD on notification socket, ignoring: %m"); _cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL; r = sd_event_add_io(event, &s, fd, EPOLLIN, handler, userdata); @@ -56,9 +60,7 @@ int notify_socket_prepare( if (r < 0) return log_debug_errno(r, "Failed to make notification event source floating: %m"); - if (ret_path) - *ret_path = TAKE_PTR(path); - + *ret_path = TAKE_PTR(path); return 0; } -- 2.47.3