daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From c7bcd6cf1967e401225c3d6057e0ee62cdc29f8c Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
923a60
Date: Thu, 29 Sep 2016 16:06:02 +0200
923a60
Subject: [PATCH] pid1: process zero-length notification messages again
923a60
923a60
This undoes 531ac2b234. I acked that patch without looking at the code
923a60
carefully enough. There are two problems:
923a60
- we want to process the fds anyway
923a60
- in principle empty notification messages are valid, and we should
923a60
  process them as usual, including logging using log_unit_debug().
923a60
923a60
Cherry-picked from: 8523bf7dd514a3a2c6114b7b8fb8f308b4f09fc4
923a60
Resolves: #1380259
923a60
923a60
Cherry-picked from: a86b767
923a60
Resolves: #1380259
923a60
---
923a60
 src/core/manager.c | 15 ++++++---------
923a60
 1 file changed, 6 insertions(+), 9 deletions(-)
923a60
923a60
diff --git a/src/core/manager.c b/src/core/manager.c
923a60
index ed81059554..0376c4d4b4 100644
923a60
--- a/src/core/manager.c
923a60
+++ b/src/core/manager.c
923a60
@@ -1614,13 +1614,12 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui
923a60
         return 0;
923a60
 }
923a60
 
923a60
-static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, char *buf, size_t n, FDSet *fds) {
923a60
+static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const char *buf, FDSet *fds) {
923a60
         _cleanup_strv_free_ char **tags = NULL;
923a60
 
923a60
         assert(m);
923a60
         assert(u);
923a60
         assert(buf);
923a60
-        assert(n > 0);
923a60
 
923a60
         tags = strv_split(buf, "\n\r");
923a60
         if (!tags) {
923a60
@@ -1682,10 +1681,6 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
923a60
                  * example... */
923a60
                 return 0;
923a60
         }
923a60
-        if (n == 0) {
923a60
-                log_debug("Got zero-length notification message. Ignoring.");
923a60
-                return 0;
923a60
-        }
923a60
 
923a60
         CMSG_FOREACH(cmsg, &msghdr) {
923a60
                 if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
923a60
@@ -1722,25 +1717,27 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
923a60
                 return 0;
923a60
         }
923a60
 
923a60
+        /* The message should be a string. Here we make sure it's NUL-terminated,
923a60
+         * but only the part until first NUL will be used anyway. */
923a60
         buf[n] = 0;
923a60
 
923a60
         /* Notify every unit that might be interested, but try
923a60
          * to avoid notifying the same one multiple times. */
923a60
         u1 = manager_get_unit_by_pid(m, ucred->pid);
923a60
         if (u1) {
923a60
-                manager_invoke_notify_message(m, u1, ucred->pid, buf, n, fds);
923a60
+                manager_invoke_notify_message(m, u1, ucred->pid, buf, fds);
923a60
                 found = true;
923a60
         }
923a60
 
923a60
         u2 = hashmap_get(m->watch_pids1, LONG_TO_PTR(ucred->pid));
923a60
         if (u2 && u2 != u1) {
923a60
-                manager_invoke_notify_message(m, u2, ucred->pid, buf, n, fds);
923a60
+                manager_invoke_notify_message(m, u2, ucred->pid, buf, fds);
923a60
                 found = true;
923a60
         }
923a60
 
923a60
         u3 = hashmap_get(m->watch_pids2, LONG_TO_PTR(ucred->pid));
923a60
         if (u3 && u3 != u2 && u3 != u1) {
923a60
-                manager_invoke_notify_message(m, u3, ucred->pid, buf, n, fds);
923a60
+                manager_invoke_notify_message(m, u3, ucred->pid, buf, fds);
923a60
                 found = true;
923a60
         }
923a60