Jin Qian
3ca00a3c98
Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev
...
am: 5c5c544e80
2017-07-05 22:40:42 +00:00
TreeHugger Robot
5c5c544e80
Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev
2017-07-05 22:33:35 +00:00
Mark Salyzyn
0c7862b805
Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938 am: eef732555d
...
am: ab6f80c350
2017-07-05 21:58:15 +00:00
Mark Salyzyn
ab6f80c350
Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938
...
am: eef732555d
2017-07-05 21:56:15 +00:00
Mark Salyzyn
eef732555d
Merge "fs_mgr: report errno string for __mount errors"
...
am: 6333cd0938
2017-07-05 21:54:17 +00:00
Treehugger Robot
6333cd0938
Merge "fs_mgr: report errno string for __mount errors"
2017-07-05 21:41:51 +00:00
Logan Chien
b0bff4a55c
Revert "Move libz to vndk-sp"
...
am: f499bcdde7
2017-07-05 13:16:22 +00:00
Logan Chien
f499bcdde7
Revert "Move libz to vndk-sp"
...
This commit removes libz.so from the exported libs of "vndk" linker
namespace and export libz.so from "default" linker namespace instead.
We have to remove libz.so from vndk-sp because we don't have a good
mechanism to stop "classloader" linker namespace from loading
/system/lib[64]/vndk-sp/libz.so. Other alternatives require significant
changes to dynamic linker or CTS test cases.
Let's temporarily revert the commit to fix b/62195853 for oc-dr1-dev.
The long-term solution will be discussed in b/37617391.
This reverts commit 63226400f3
2017-07-05 11:18:13 +08:00
Jiyong Park
c97952a2d3
Merge "zlib is not exposed to libziparchive headers" am: eb42bb8c8b am: d74d572f9d
...
am: 022b164c77
2017-07-03 19:41:27 +00:00
Jiyong Park
022b164c77
Merge "zlib is not exposed to libziparchive headers" am: eb42bb8c8b
...
am: d74d572f9d
2017-07-03 19:38:25 +00:00
Jiyong Park
d74d572f9d
Merge "zlib is not exposed to libziparchive headers"
...
am: eb42bb8c8b
2017-07-03 19:34:56 +00:00
Treehugger Robot
eb42bb8c8b
Merge "zlib is not exposed to libziparchive headers"
2017-07-03 19:30:45 +00:00
Jiyong Park
e7cf680ccc
zlib is not exposed to libziparchive headers
...
By forward-declaring zstream, we don't need to re-export zlib headers.
Bug: 37342627
Test: build
Test: BOARD_VNDK_VERSION=current m -j dumpstate (or any other module
using libziparchive)
Change-Id: Ia69e5d459c79878d491cfe4ca21a7cc8fed4a5d8
2017-07-03 17:44:07 +00:00
Jiyong Park
a55bf0970d
Merge "libziparchive headers are moved to local directory" am: 7b44858b91 am: 4724e91dad
...
am: da3af937a1
2017-07-03 08:18:20 +00:00
Jiyong Park
da3af937a1
Merge "libziparchive headers are moved to local directory" am: 7b44858b91
...
am: 4724e91dad
2017-07-03 08:15:20 +00:00
Jiyong Park
4724e91dad
Merge "libziparchive headers are moved to local directory"
...
am: 7b44858b91
2017-07-03 08:12:51 +00:00
Treehugger Robot
7b44858b91
Merge "libziparchive headers are moved to local directory"
2017-07-03 08:06:40 +00:00
Jiyong Park
55b896f1e5
Merge "Ran clang-format on libziparchive sources and headers" am: aa82721894 am: 1fd5216370
...
am: b84d631915
2017-07-03 00:54:56 +00:00
Jiyong Park
b84d631915
Merge "Ran clang-format on libziparchive sources and headers" am: aa82721894
...
am: 1fd5216370
2017-07-03 00:52:26 +00:00
Jiyong Park
1fd5216370
Merge "Ran clang-format on libziparchive sources and headers"
...
am: aa82721894
2017-07-03 00:49:56 +00:00
Treehugger Robot
aa82721894
Merge "Ran clang-format on libziparchive sources and headers"
2017-07-03 00:45:16 +00:00
Jiyong Park
cdf7ff8e20
libziparchive headers are moved to local directory
...
libziparchive headers are moved from the global include directory
(/system/core/include) to the local directory inside libziparchive.
Note: /system/core/include/ziparchive still exists as a symlink to
libarchive/include/ziparchive. This will be removed when there is no
header-only dependency to libziparchive.
Bug: 37342627
Test: build
Change-Id: I3631ffc2df7be8a064d64a625d10436090c3bb0f
2017-07-02 04:33:34 +00:00
Jiyong Park
cd997e6094
Ran clang-format on libziparchive sources and headers
...
Test: build aosp_arm
Change-Id: I469b82b68f2c457f480fb9cd9da2026672985ce3
2017-07-02 11:46:53 +09:00
Nick Kralevich
4192d74a83
Merge "Remove unnecessary SELinux dependencies" am: 22de50d351 am: e9b9b10c58
...
am: 0056e6bccc
2017-07-01 16:49:35 +00:00
Nick Kralevich
0056e6bccc
Merge "Remove unnecessary SELinux dependencies" am: 22de50d351
...
am: e9b9b10c58
2017-07-01 16:44:36 +00:00
Nick Kralevich
e9b9b10c58
Merge "Remove unnecessary SELinux dependencies"
...
am: 22de50d351
2017-07-01 16:39:37 +00:00
Treehugger Robot
22de50d351
Merge "Remove unnecessary SELinux dependencies"
2017-07-01 16:35:17 +00:00
Nick Kralevich
33391dad15
Remove unnecessary SELinux dependencies
...
These are unused.
Test: code compiles.
Change-Id: Idd707dfcc8f6daac3a489c791ecc364841cf31f9
2017-07-01 07:41:48 -07:00
Luis Hector Chavez
dd79958ecb
Merge "init: Read previous state of securebits before modifying" am: c10e14110a am: 19f32317b3
...
am: 9dabbbaa6a
2017-07-01 00:39:42 +00:00
Luis Hector Chavez
9dabbbaa6a
Merge "init: Read previous state of securebits before modifying" am: c10e14110a
...
am: 19f32317b3
2017-07-01 00:35:11 +00:00
Luis Hector Chavez
19f32317b3
Merge "init: Read previous state of securebits before modifying"
...
am: c10e14110a
2017-07-01 00:30:42 +00:00
Treehugger Robot
c10e14110a
Merge "init: Read previous state of securebits before modifying"
2017-07-01 00:20:50 +00:00
Luis Hector Chavez
f5965519d1
init: Read previous state of securebits before modifying
...
When Android is running in a container, some of the securebits might be
locked, which makes prctl(PR_SET_SECUREBITS) fail.
This change gets the previous state of the process' securebits and adds
the desired bits.
Bug: 62388055
Test: aosp_bullhead-eng boots
Test: If init has non-zero securebits, it can also boot
Change-Id: Ie03bf2538f9dca40955bc58314d269246f5731bd
2017-06-30 14:42:46 -07:00
Steven Moreland
f73510e78d
Merge "logd + liblogd to Android.bp" am: c997cd64dc am: f7a68f02d5
...
am: 25982a424b
2017-06-30 19:49:16 +00:00
Steven Moreland
25982a424b
Merge "logd + liblogd to Android.bp" am: c997cd64dc
...
am: f7a68f02d5
2017-06-30 19:45:07 +00:00
Steven Moreland
f7a68f02d5
Merge "logd + liblogd to Android.bp"
...
am: c997cd64dc
2017-06-30 19:40:45 +00:00
Treehugger Robot
c997cd64dc
Merge "logd + liblogd to Android.bp"
2017-06-30 19:32:41 +00:00
Tianjie Xu
bf6f0eeb10
Merge changes Ie89f709b,Ibf543a7d,I1d8092a1 am: 67897d47ce -s ours am: 14f913817f -s ours
...
am: 5f7bb2b1df
2017-06-30 15:55:13 +00:00
Tianjie Xu
5f7bb2b1df
Merge changes Ie89f709b,Ibf543a7d,I1d8092a1 am: 67897d47ce -s ours
...
am: 14f913817f
2017-06-30 15:50:42 +00:00
Tianjie Xu
14f913817f
Merge changes Ie89f709b,Ibf543a7d,I1d8092a1
...
am: 67897d47ce
2017-06-30 15:46:13 +00:00
Treehugger Robot
67897d47ce
Merge changes Ie89f709b,Ibf543a7d,I1d8092a1
...
* changes:
Fix out of bound read in libziparchive
Check filename memory bound when parsing ziparchive
Fix out of bound access in libziparchive
2017-06-30 15:38:13 +00:00
Tianjie Xu
0fda1cf633
Fix out of bound read in libziparchive
...
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.
Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
Merged-In: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361
2017-06-30 17:19:56 +09:00
Tianjie Xu
9e020e2d11
Check filename memory bound when parsing ziparchive
...
Add a check to ensure the filename boundary doesn't exceed the mapped
memory region. Also add the corresponding unit test.
Bug: 28802225
Test: New unit test passes.
Merged-In: Ibf543a7da3d7898952e9eb332c84cdfc67cf5aa4
Change-Id: Ibf543a7da3d7898952e9eb332c84cdfc67cf5aa4
(cherry picked from commit bcc4431f24
2017-06-30 17:19:28 +09:00
Tianjie Xu
fba1a36fd9
Fix out of bound access in libziparchive
...
The boundary check of an invalid EOCD record may succeed due to the
overflow of uint32_t. Fix the check and add a unit test.
Test: Open the crash.apk and libziparchive reports the offset error as expected.
Bug: 31251826
Merged-In: I1d8092a19b73886a671bc9d291cfc27d65e3d236
Change-Id: I1d8092a19b73886a671bc9d291cfc27d65e3d236
(cherry picked from commit ae8180c06d
2017-06-30 17:18:31 +09:00
Colin Cross
33c6549f73
Merge "Fix ScopedSignalHandler" am: 7dbf1a187e am: 1deafe164b
...
am: 9a29d20486
2017-06-30 06:59:07 +00:00
Colin Cross
9a29d20486
Merge "Fix ScopedSignalHandler" am: 7dbf1a187e
...
am: 1deafe164b
2017-06-30 06:54:38 +00:00
Colin Cross
1deafe164b
Merge "Fix ScopedSignalHandler"
...
am: 7dbf1a187e
2017-06-30 06:50:38 +00:00
Treehugger Robot
7dbf1a187e
Merge "Fix ScopedSignalHandler"
2017-06-30 06:44:40 +00:00
Luis Hector Chavez
1b42dbf22c
Merge changes I0a95f87a,I36b22986 am: a703202093 am: 835d259e7a
...
am: 40e88b22f2
2017-06-30 04:33:30 +00:00
Luis Hector Chavez
40e88b22f2
Merge changes I0a95f87a,I36b22986 am: a703202093
...
am: 835d259e7a
2017-06-30 04:29:28 +00:00
