|
 |
803fb7 |
From 529c94b47f886f99796cff0f5827d6c2ebdcea19 Mon Sep 17 00:00:00 2001
|
|
|
803fb7 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
803fb7 |
Date: Mon, 2 Mar 2015 20:55:38 +0100
|
|
|
803fb7 |
Subject: [PATCH] sd-daemon: replace VLA with alloca(), to make llvm happy
|
|
|
803fb7 |
|
|
|
803fb7 |
https://bugs.freedesktop.org/show_bug.cgi?id=89379
|
|
|
803fb7 |
(cherry picked from commit d4a144fadf89bca681724c6c9a65b4a165fa0f90)
|
|
|
803fb7 |
---
|
|
|
803fb7 |
src/libsystemd/sd-daemon/sd-daemon.c | 12 +++++-------
|
|
|
803fb7 |
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
|
|
|
803fb7 |
index 028c2a7a5..22a3a5347 100644
|
|
|
803fb7 |
--- a/src/libsystemd/sd-daemon/sd-daemon.c
|
|
|
803fb7 |
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
|
|
|
803fb7 |
@@ -352,11 +352,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
|
|
|
803fb7 |
.msg_iovlen = 1,
|
|
|
803fb7 |
.msg_name = &sockaddr,
|
|
|
803fb7 |
};
|
|
|
803fb7 |
- union {
|
|
|
803fb7 |
- struct cmsghdr cmsghdr;
|
|
|
803fb7 |
- uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
|
|
|
803fb7 |
- CMSG_SPACE(sizeof(int) * n_fds)];
|
|
|
803fb7 |
- } control;
|
|
|
803fb7 |
+ struct cmsghdr *control;
|
|
|
803fb7 |
_cleanup_close_ int fd = -1;
|
|
|
803fb7 |
struct cmsghdr *cmsg = NULL;
|
|
|
803fb7 |
const char *e;
|
|
|
803fb7 |
@@ -400,8 +396,10 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
|
|
|
803fb7 |
if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
|
|
|
803fb7 |
msghdr.msg_namelen = sizeof(struct sockaddr_un);
|
|
|
803fb7 |
|
|
|
803fb7 |
+ control = alloca(CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int) * n_fds));
|
|
|
803fb7 |
+
|
|
|
803fb7 |
if (n_fds > 0) {
|
|
|
803fb7 |
- msghdr.msg_control = &control;
|
|
|
803fb7 |
+ msghdr.msg_control = control;
|
|
|
803fb7 |
msghdr.msg_controllen = CMSG_LEN(sizeof(int) * n_fds);
|
|
|
803fb7 |
|
|
|
803fb7 |
cmsg = CMSG_FIRSTHDR(&msghdr);
|
|
|
803fb7 |
@@ -418,7 +416,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
|
|
|
803fb7 |
try_without_ucred = true;
|
|
|
803fb7 |
controllen_without_ucred = msghdr.msg_controllen;
|
|
|
803fb7 |
|
|
|
803fb7 |
- msghdr.msg_control = &control;
|
|
|
803fb7 |
+ msghdr.msg_control = control;
|
|
|
803fb7 |
msghdr.msg_controllen += CMSG_LEN(sizeof(struct ucred));
|
|
|
803fb7 |
|
|
|
803fb7 |
if (cmsg)
|