commit 27460366e806f3bca0db0780b53165b82deab684
author Mark Salyzyn <salyzyn@google.com> Tue Jan 12 19:30:13 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 19:30:13 2016 +0000
tree b63e749c817f897542a84efeedc47d95aa9b6e7d
parent e4b332c7e4ce19e1e2e6d8fe001d8c9e1709f280
parent 4690640760983dffa9b28e257aac293da4282e85

Merge "logd: unaligned access on security buffer"

logd/LogListener.cpp

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index 5348a2d..846dd7c 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <limits.h>
+#include <sys/cdefs.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -46,7 +47,7 @@
         + LOGGER_ENTRY_MAX_PAYLOAD];
     struct iovec iov = { buffer, sizeof(buffer) };
 
-    char control[CMSG_SPACE(sizeof(struct ucred))];
+    char control[CMSG_SPACE(sizeof(struct ucred))] __aligned(4);
     struct msghdr hdr = {
         NULL,
         0,