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