Commit graph

15746 commits

Author SHA1 Message Date
Paul Lawrence
f3fbfaef22 am c1fa34b9: am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev
* commit 'c1fa34b9f600c827769b4401d8b12e7c587b68f4':
  Change init sequence to support file level encryption
2015-07-13 22:39:08 +00:00
Paul Lawrence
c1fa34b9f6 am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev
* commit 'd5ef984195779aa9e27d7baabdd751d641eea1a0':
  Change init sequence to support file level encryption
2015-07-13 17:53:08 +00:00
Paul Lawrence
d5ef984195 Merge "Change init sequence to support file level encryption" into mnc-dr-dev 2015-07-13 16:56:02 +00:00
Calin Juravle
c5e804a1e8 am 8ee286c2: am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit '8ee286c2164a4a6a8106b21500a336e15c615884':
  Allow native bridge to work without a code cache
2015-07-13 15:15:00 +00:00
Calin Juravle
8ee286c216 am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit 'ed5c99eaccd7382689d683ddfe6c164c86f2e71a':
  Allow native bridge to work without a code cache
2015-07-13 13:18:29 +00:00
Calin Juravle
ed5c99eacc am 09a0b17d: Merge "Allow native bridge to work without a code cache"
* commit '09a0b17d863b919f109a6377a4b3e1e75bb67a98':
  Allow native bridge to work without a code cache
2015-07-13 13:02:42 +00:00
Calin Juravle
09a0b17d86 Merge "Allow native bridge to work without a code cache" 2015-07-13 12:50:44 +00:00
Tao Bao
b981b3885d am 58cfceb8: am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit '58cfceb88b2c436b61129cedefaa8e15758606f8':
  libsparse: Wrap sparse_crc32.h to be C++ compatible.
2015-07-11 22:23:45 +00:00
Tao Bao
58cfceb88b am 75b3f8c9: am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit '75b3f8c9a608c4a08f7894ace35275df75b2d71c':
  libsparse: Wrap sparse_crc32.h to be C++ compatible.
2015-07-11 22:11:35 +00:00
Tao Bao
75b3f8c9a6 am 87101256: Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible."
* commit '871012566441e1b14b03ef0584402f31b668c96a':
  libsparse: Wrap sparse_crc32.h to be C++ compatible.
2015-07-11 21:58:33 +00:00
Tao Bao
8710125664 Merge "libsparse: Wrap sparse_crc32.h to be C++ compatible." 2015-07-11 21:46:46 +00:00
Tao Bao
a29c0127fa libsparse: Wrap sparse_crc32.h to be C++ compatible.
Change-Id: Ic6b1721859937984619a262c459f1f734d81c149
2015-07-11 12:48:42 -07:00
Andres Morales
17aa7571f9 [gatekeeperd] fix other unaligned mem access
Initially tested with the wrong (mnc) toolchain
which just hid the error entirely. Now tested with
master toolchain so this should be the last instance.

Bug: 22367550
Change-Id: I0e785918b1a9f4a8af80dc96b794737fcfd12367
2015-07-10 13:56:02 -07:00
Thierry Strudel
6cd33beb8f am 9faa258f: am 2407ec38: am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit '9faa258f71ea4fe407cbf9cc6477ad41dadfab9a':
  fs_config: replace getenv('OUT') by new fs_config parameter
2015-07-10 19:39:55 +00:00
Thierry Strudel
9faa258f71 am 2407ec38: am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit '2407ec386514e40c5b4f2489c598b15af2a67c97':
  fs_config: replace getenv('OUT') by new fs_config parameter
2015-07-10 19:26:22 +00:00
Thierry Strudel
2407ec3865 am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit '8703bea1807326fef9835bc474e7a7288c725925':
  fs_config: replace getenv('OUT') by new fs_config parameter
2015-07-10 18:43:45 +00:00
Thierry Strudel
8703bea180 Merge "fs_config: replace getenv('OUT') by new fs_config parameter" into mnc-dev 2015-07-10 18:28:03 +00:00
Andres Morales
0e761b8c39 am 07f0aef8: am a5c8358a: am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit '07f0aef8b98aea677e2f97589a6866903ed540ef':
  [gatekeeperd] fix use of uninitialized memory
2015-07-10 18:27:49 +00:00
Andres Morales
07f0aef8b9 am a5c8358a: am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit 'a5c8358a31a62315b9904d508316d3d4ca962d93':
  [gatekeeperd] fix use of uninitialized memory
2015-07-10 18:14:14 +00:00
Andres Morales
5767a723bb am beb4fa62: am b8fb72e0: am 0b0435ea: [gatekeeperd] fix file descriptor leak
* commit 'beb4fa627b8da911a2d61d5e51b8df6af6c76c74':
  [gatekeeperd] fix file descriptor leak
2015-07-10 18:05:33 +00:00
Andres Morales
beb4fa627b am b8fb72e0: am 0b0435ea: [gatekeeperd] fix file descriptor leak
* commit 'b8fb72e02ffccab7d3c7370c395085b5cab40497':
  [gatekeeperd] fix file descriptor leak
2015-07-10 17:55:50 +00:00
Andres Morales
a5c8358a31 am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit '787c3764d305168e927c29d5d57ae68e242cd7a9':
  [gatekeeperd] fix use of uninitialized memory
2015-07-10 17:30:28 +00:00
Andres Morales
787c3764d3 Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev 2015-07-10 17:20:31 +00:00
Andres Morales
b8fb72e02f am 0b0435ea: [gatekeeperd] fix file descriptor leak
* commit '0b0435ea87f87b31652a2c6272c1f77438bfcdf1':
  [gatekeeperd] fix file descriptor leak
2015-07-10 17:10:33 +00:00
Andres Morales
0b0435ea87 [gatekeeperd] fix file descriptor leak
Bug: 22403703
Change-Id: I65da3b3b3f85db035d79277344beb5460cb025f2
2015-07-10 09:47:09 -07:00
Thierry Strudel
df33ffadd2 fs_config: replace getenv('OUT') by new fs_config parameter
Using a getenv('OUT') in such a deep down function is a wrong design
choice. Replacing with explicit parameter that may be NULL in case
device specific files can be accessed from /.
Since TARGET_COPY_OUT_SYSTEM may be defined to something different than
system we also ensure that we use a path relative to TARGET_OUT to
compute path to fs_config_* files.

Bug: 21989305
Bug: 22048934
Change-Id: Id91bc183b29beac7379d1117ad83bd3346e6897b
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-09 21:47:07 -07:00
jgu21
cef898fa8f Allow native bridge to work without a code cache
In isolatedProcess, the app_code_cache_dir is not needed
for native bridge. This commit allows native bridge to work
without a code cache in isolatedProcess.

Change-Id: I8580268d5ec6ca8d44e4500c3fafe10408e1e0d3
Signed-off-by: jgu21 <jinghui.gu@intel.com>
2015-07-10 11:22:09 +08:00
Christopher Ferris
879765d39b am e7203eea: am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable."
* commit 'e7203eea222616c2dab37b49e25d7ea4c1367a91':
  Dump memory going from unreadable to readable.
2015-07-10 00:15:30 +00:00
Christopher Ferris
e7203eea22 am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable."
* commit 'c03e40fb8170a40377823a5a5dbe087df0887acc':
  Dump memory going from unreadable to readable.
2015-07-10 00:02:28 +00:00
Christopher Ferris
c03e40fb81 am a3ee46f1: Merge "Dump memory going from unreadable to readable."
* commit 'a3ee46f1056fd52b05b627319cf82da75c6c7e59':
  Dump memory going from unreadable to readable.
2015-07-09 23:48:37 +00:00
Christopher Ferris
a3ee46f105 Merge "Dump memory going from unreadable to readable." 2015-07-09 23:38:26 +00:00
Andres Morales
3439f41abf [gatekeeperd] copy uid to local before passing to u_map
The compiler will issue the unaligned access instuctions
when reading from a packed struct. Since 'find' takes a
reference, if we pass the field directly it is removed
from its packed context and may be unreadable.

Read the field out directly from the packed struct and pass
in aligned to u_map to fix.

Bug: 22367550
Change-Id: Ia3b639c7518154ff5a2b7c233b752e154eab9aad
2015-07-09 23:26:44 +00:00
Pirama Arumuga Nainar
bf94f03d0f am f6b2a7ff: am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"
* commit 'f6b2a7ffe2fa1feeb676530cd5da69335ece09ed':
  Use delete[] to de-allocate pointers from new[]
2015-07-09 23:18:14 +00:00
Pirama Arumuga Nainar
f6b2a7ffe2 am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"
* commit '850745382a294b2d9ab8d5288980a3858821cb0a':
  Use delete[] to de-allocate pointers from new[]
2015-07-09 23:06:08 +00:00
Pirama Arumuga Nainar
850745382a am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"
* commit '8cd62808d40de4ebd3ce95ea151fcc13260103fd':
  Use delete[] to de-allocate pointers from new[]
2015-07-09 22:50:56 +00:00
Pirama Arumuga Nainar
8cd62808d4 Merge "Use delete[] to de-allocate pointers from new[]" 2015-07-09 22:40:32 +00:00
Christopher Ferris
456abbabf2 Dump memory going from unreadable to readable.
If the first read when dumping memory returns no data, skip ahead to
the next page boundary and try and read from there. This fixes a case
where the address at which to start dumping memory is unreadable, but
crosses back into readable memory.

Bug: 22234753
Change-Id: Ie28d5c027013577ca06f5396aba498366a3b6749
2015-07-09 15:35:47 -07:00
Dan Albert
09ec79c584 am 01c48dce: am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""
* commit '01c48dceba50bcdc4cf313217b4d79dabb6721fe':
  Revert "Turn on -Wformat-nonliteral."
2015-07-09 21:17:44 +00:00
Dan Albert
01c48dceba am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""
* commit '00599eca7446f28762da3854566cff0b2ba46799':
  Revert "Turn on -Wformat-nonliteral."
2015-07-09 21:04:17 +00:00
Dan Albert
00599eca74 am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""
* commit 'e84205bf6ee391c9e2fec14b6bffc1f9f096bfdf':
  Revert "Turn on -Wformat-nonliteral."
2015-07-09 20:49:15 +00:00
Dan Albert
e84205bf6e Merge "Revert "Turn on -Wformat-nonliteral."" 2015-07-09 20:35:36 +00:00
Dan Albert
286bb6ddbd Revert "Turn on -Wformat-nonliteral."
One of my build aliases doesn't play nice with USE_MINGW=1, so my build lied to me. Will revert until I fix it up.

This reverts commit 459df8f3a1.

Change-Id: I7905c5ae5ee85fb2d228ce63d81c79f140998c18
2015-07-09 20:35:09 +00:00
Dan Albert
820b13713c am 1ce139b2: am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral."
* commit '1ce139b2ce9df43557a9e9dcb4d4b09e97e81e94':
  Turn on -Wformat-nonliteral.
2015-07-09 20:32:30 +00:00
Dan Albert
1ce139b2ce am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral."
* commit 'fcdc3141d3209afb8a8a62764fa66911a7104e74':
  Turn on -Wformat-nonliteral.
2015-07-09 20:20:41 +00:00
Dan Albert
fcdc3141d3 am a35affb5: Merge "Turn on -Wformat-nonliteral."
* commit 'a35affb5fc9e7cd19a2669a82cda19789314a783':
  Turn on -Wformat-nonliteral.
2015-07-09 20:00:55 +00:00
Dan Albert
a35affb5fc Merge "Turn on -Wformat-nonliteral." 2015-07-09 19:48:55 +00:00
Elliott Hughes
04f7d2eeb9 am 33cd7314: am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32."
* commit '33cd7314a3b93fef31804ec6906ea128408da27f':
  Replace HAVE_WIN32_IPC with _WIN32.
2015-07-09 18:39:07 +00:00
Elliott Hughes
33cd7314a3 am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32."
* commit '9d748c8bf4b3b4810c6ad9dcc75322c8059c3876':
  Replace HAVE_WIN32_IPC with _WIN32.
2015-07-09 17:57:35 +00:00
Pirama Arumuga Nainar
837eff22c8 Use delete[] to de-allocate pointers from new[]
Upstream clang has a new diagnostic, '-Wmismatched-new-delete' to
generate a warning (that becomes an error with -Werror) when delete is
used to deallocate pointers created with 'new[]'.  This patch fixes
'delete's that trigger this warning/error.

Change-Id: I7551e856b4b13bfae4cb78b5664d8652322683cf
2015-07-09 10:50:04 -07:00
Dan Albert
459df8f3a1 Turn on -Wformat-nonliteral.
Apparently there are two classes of this warning in clang.
-Wformat-security is only emitted for cases of
`func(nonliteral_fmt_string)` (no args), and -Wformat-nonliteral is
emitted for cases *with* arguments. For whatever reason, the latter
isn't included in -Wextra and must be manually enabled.

To make this more easily portable to Windows, move the existing
gnu_printf/__printf__ decision into base/macros.h as ATTRIBUTE_FORMAT.

Change-Id: I3b0990e1d1f0a2e9c13b32f5cd60478946cb5fc6
2015-07-09 10:47:24 -07:00