From 3f0c8096f3d5e3b37d6e0e26f0562c1a8669f0d8 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 2 Mar 2015 20:55:38 +0100

Subject: [PATCH] sd-daemon: replace VLA with alloca(), to make llvm happy

https://bugs.freedesktop.org/show_bug.cgi?id=89379

(cherry picked from commit d4a144fadf89bca681724c6c9a65b4a165fa0f90)

---

 src/libsystemd/sd-daemon/sd-daemon.c | 12 +++++-------

 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c

index 028c2a7a5b..22a3a5347a 100644

--- a/src/libsystemd/sd-daemon/sd-daemon.c

+++ b/src/libsystemd/sd-daemon/sd-daemon.c

@@ -352,11 +352,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char

                 .msg_iovlen = 1,

                 .msg_name = &sockaddr,

         };

-        union {

-                struct cmsghdr cmsghdr;

-                uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +

-                            CMSG_SPACE(sizeof(int) * n_fds)];

-        } control;

+        struct cmsghdr *control;

         _cleanup_close_ int fd = -1;

         struct cmsghdr *cmsg = NULL;

         const char *e;

@@ -400,8 +396,10 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char

         if (msghdr.msg_namelen > sizeof(struct sockaddr_un))

                 msghdr.msg_namelen = sizeof(struct sockaddr_un);

+        control = alloca(CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int) * n_fds));

+

         if (n_fds > 0) {

-                msghdr.msg_control = &control;

+                msghdr.msg_control = control;

                 msghdr.msg_controllen = CMSG_LEN(sizeof(int) * n_fds);

                 cmsg = CMSG_FIRSTHDR(&msghdr);

@@ -418,7 +416,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char

                 try_without_ucred = true;

                 controllen_without_ucred = msghdr.msg_controllen;

-                msghdr.msg_control = &control;

+                msghdr.msg_control = control;

                 msghdr.msg_controllen += CMSG_LEN(sizeof(struct ucred));

                 if (cmsg)