clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 23:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1215 from maciejaszek/fds_pass_fixes

Browse Source 
sd_pid_notify_with_fds: fix computing msg_controllen
This commit is contained in:
Lennart Poettering
2015-09-09 14:44:52 +02:00
parent 0f9415d44c a5bd3c32ab
commit 5bdb84b393
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-daemon/sd-daemon.c
+3 -2
View File
@@ -395,8 +395,9 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
have_pid = pid != 0 && pid != getpid();
if (n_fds > 0 || have_pid) {
msghdr.msg_controllen = CMSG_SPACE(sizeof(int) * n_fds) +
CMSG_SPACE(sizeof(struct ucred) * have_pid);
/* CMSG_SPACE(0) may return value different then zero, which results in miscalculated controllen. */
msghdr.msg_controllen = (n_fds ? CMSG_SPACE(sizeof(int) * n_fds) : 0) +
CMSG_SPACE(sizeof(struct ucred)) * have_pid;
msghdr.msg_control = alloca(msghdr.msg_controllen);
cmsg = CMSG_FIRSTHDR(&msghdr);