Merge "logd: unaligned access on security buffer"

am: 27460366e8

* commit '27460366e806f3bca0db0780b53165b82deab684':
  logd: unaligned access on security buffer
This commit is contained in:
Mark Salyzyn 2016-01-12 19:49:23 +00:00 committed by android-build-merger
commit bf5bb53a43

View file

@ -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 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
+ 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,