From cd238111a7980917e04cfdc5dae144d1fb4c0a49 Mon Sep 17 00:00:00 2001

From: Jorge Niedbalski <jorge.niedbalski@canonical.com>

Date: Wed, 28 Sep 2016 18:25:50 -0300

Subject: [PATCH] If the notification message length is 0, ignore the message

 (#4237)

Fixes #4234.

Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>

Cherry-picked from: 531ac2b2349da02acc9c382849758e07eb92b020

Resolves: #1380175

---

 src/core/manager.c | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/src/core/manager.c b/src/core/manager.c

index 71dd70c94..689b26615 100644

--- a/src/core/manager.c

+++ b/src/core/manager.c

@@ -1678,6 +1678,10 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t

                 return -errno;

         }

+        if (n == 0) {

+                log_debug("Got zero-length notification message. Ignoring.");

+                return 0;

+        }

         CMSG_FOREACH(cmsg, &msghdr) {

                 if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {