commit 9b83d808449856973d78315e8ea896e1112079be
author Martijn Coenen <maco@google.com> Wed Jan 25 02:09:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 02:09:00 2017 +0000
tree a53a7cb62017b23460a06505845afa793d12c713
parent 4f3e04466a898147993d3e5b701b9c02cb3d5396
parent d2efee90c4f003027aacb2075aeaccd184737af1

Pad binder_fd_array_object. am: 824875dd45 am: 7b0382ca44
am: d2efee90c4

Change-Id: Ib533b9ba3fbde88cb5f5c368270f9cae7d795754

include/hwbinder/binder_kernel.h

diff --git a/include/hwbinder/binder_kernel.h b/include/hwbinder/binder_kernel.h
index a76d8b4..2494f68 100644
--- a/include/hwbinder/binder_kernel.h
+++ b/include/hwbinder/binder_kernel.h
@@ -90,8 +90,8 @@
  */
 struct binder_fd_array_object {
 	struct binder_object_header	hdr;
-
-	binder_size_t           num_fds;
+	__u32			_pad; /* hdr is 4 bytes, ensure 8-byte alignment of next fields */
+	binder_size_t		num_fds;
 	binder_size_t		parent; /* index of parent in objects array */
 	binder_size_t		parent_offset; /* offset of pointer in parent */
 };