SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd_pid_notify_with_fds: fix computing msg_controllen

Browse Source 
CMSG_SPACE(0) may return value other than 0. This caused sendmsg to fail
with EINVAL, when have_pid or n_fds was 0.
This commit is contained in:
Maciej Wereski
2015-09-09 14:28:43 +02:00
parent 542a69a284
commit a5bd3c32ab
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);