Merge "logd: unaligned access on security buffer"

This commit is contained in:
Mark Salyzyn 2016-01-12 19:30:13 +00:00 committed by Gerrit Code Review
commit 27460366e8

View file

@ -15,6 +15,7 @@
*/ */
#include <limits.h> #include <limits.h>
#include <sys/cdefs.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
@ -46,7 +47,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
+ LOGGER_ENTRY_MAX_PAYLOAD]; + LOGGER_ENTRY_MAX_PAYLOAD];
struct iovec iov = { buffer, sizeof(buffer) }; 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 = { struct msghdr hdr = {
NULL, NULL,
0, 0,