diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-10-12 14:44:26 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-10-12 15:15:25 +0200 |
| commit | 40f44238924acf4e7a3ddfc1b0b1c111032bb43d (patch) | |
| tree | c697af52c33ab9c3d64015fd6077b5b98d01e6a2 /src/libsystemd/sd-daemon/sd-daemon.c | |
| parent | 0a41d91f3022ae5107151ebd1af9b65a55030c7e (diff) | |
sd-daemon: wipe out memory before using CMSG_NXTHDR()
CMSG_NXTHDR() checks for cmsg->cmsg_len *after* it increased the pointer.
While this makes sense for parsing received messages, that's a pitfall
for code crafting messages with this macro.
Wipe out the allocated memory to fix this.
Diffstat (limited to 'src/libsystemd/sd-daemon/sd-daemon.c')
| -rw-r--r-- | src/libsystemd/sd-daemon/sd-daemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 582fb53529..ae534ba5b9 100644 --- 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) { |