From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Sat, 26 Nov 2016 09:16:47 +0000 (+0100)
Subject: service: prevent registering control pids as the main pid
X-Git-Tag: v233~375^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c9512c71d49d42513755cfa4329275c0360f397;p=thirdparty%2Fsystemd.git

service: prevent registering control pids as the main pid

We assume a process can be only one of the two in service_sigchld_event.
---

diff --git a/src/core/service.c b/src/core/service.c
index 39b3589e6ba..bb67bdf84ca 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3071,6 +3071,8 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds)
         if (e && IN_SET(s->state, SERVICE_START, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD)) {
                 if (parse_pid(e, &pid) < 0)
                         log_unit_warning(u, "Failed to parse MAINPID= field in notification message: %s", e);
+                else if (pid == s->control_pid)
+                        log_unit_warning(u, "A control process cannot also be the main process");
                 else {
                         service_set_main_pid(s, pid);
                         unit_watch_pid(UNIT(s), pid);