Merge pull request #1540 from zonque/cmsg

sd-daemon: wipe out memory before using CMSG_NXTHDR()
systemd · Oct 12, 2015 · b7d18f2 · b7d18f2
2 parents 09ba85f + 40f4423
commit b7d18f2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -454,7 +454,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
                         (n_fds > 0 ? CMSG_SPACE(sizeof(int) * n_fds) : 0) +
                         (have_pid ? CMSG_SPACE(sizeof(struct ucred)) : 0);
 
-                msghdr.msg_control = alloca(msghdr.msg_controllen);
+                msghdr.msg_control = alloca0(msghdr.msg_controllen);
 
                 cmsg = CMSG_FIRSTHDR(&msghdr);
                 if (n_fds > 0) {