Commit graph

49861 commits

Author SHA1 Message Date
Suren Baghdasaryan
b552c4ad9a Merge "libprocessgroup: Deliberately leak TaskProfiles and CgroupMap instances." 2019-03-22 16:04:56 +00:00
Yifan Hong
567f1874fd init: expand prop in 'file'
Allow having properties in 'file' option of a service.

Test: boots (sanity)
Test: lpdumpd
Bug: 126233777
Change-Id: I55158b81e3829b393a9725fd8f09200690d0230f
2019-03-21 16:00:00 -07:00
Yifan Hong
dd6eefca30 libcutils: android_get_control_file uses realpath.
If the path to android_get_control_file is a symlink, the final sanity
check will fail that the fd does not have the same path as the given
file. We can't expect callers to readlink() because this would change
the environment key. Instead, try to call realpath on both paths.

Bug: 126233777
Test: lpdump
Change-Id: I0df10d7dbe3e572b8335faad812e5cd80bff1733
2019-03-21 16:00:00 -07:00
Elliott Hughes
7acb0d39e8 Clean up some mess by only building Android-specific code for the device.
Test: treehugger
Change-Id: Id44721ccd1817d8c537b226f60a58b7cb691fb01
2019-03-21 14:59:45 -07:00
Colin Cross
ea4eaba147 Merge "Catch SIGBUS in HeapWalker" am: b566e3cb2f am: 9926972bff
am: 549346f9ee

Change-Id: I77eecda271e3dffcd1dd902c75fff4d559a9c9cc
2019-03-21 12:28:24 -07:00
Vic Yang
87215c2530 Fix parse_apex_configs doc in README.md
Test: None
Change-Id: I0871e640cfcab706a5396e3824a1f75239c29840
2019-03-21 11:59:29 -07:00
Colin Cross
549346f9ee Merge "Catch SIGBUS in HeapWalker" am: b566e3cb2f
am: 9926972bff

Change-Id: Ia15f16850b100a32f7189ebef8819f09e465d90f
2019-03-21 11:26:59 -07:00
Colin Cross
9926972bff Merge "Catch SIGBUS in HeapWalker"
am: b566e3cb2f

Change-Id: Ie08b1c6f7e30e562404f03f338fcf89027514a84
2019-03-21 11:05:01 -07:00
Colin Cross
b566e3cb2f Merge "Catch SIGBUS in HeapWalker" 2019-03-21 17:48:03 +00:00
Yurii Zubrytskyi
e8e022596b Merge "[base] Convert Starts/Ends/Equals string functions to string_view" am: 1265bc9c6f am: 8a7e47861a
am: 1534041335

Change-Id: Ic451a61419e5c9ef891374fb619f9949eb597901
2019-03-21 10:39:32 -07:00
Yurii Zubrytskyi
1534041335 Merge "[base] Convert Starts/Ends/Equals string functions to string_view" am: 1265bc9c6f
am: 8a7e47861a

Change-Id: Ib37994c7c1bd672c18d0b4466458a65aaa2b90ec
2019-03-21 10:34:25 -07:00
Yurii Zubrytskyi
8a7e47861a Merge "[base] Convert Starts/Ends/Equals string functions to string_view"
am: 1265bc9c6f

Change-Id: I6e8588acda762e269fc1512e84cfc315b5344f31
2019-03-21 10:27:17 -07:00
Vic Yang
4a85f3c92a Fix sed command on Mac builds
Bug: 119423884
Test: Manually test sed command on Mac
Change-Id: I8df32b2476a01e2b758ea81f00dae0b6179ba79a
2019-03-21 10:16:06 -07:00
Pete Bentley
cc6c50a123 Tighten native API surface.
AsynchronousCloseMonitor is moved into libandroidio by
r.android.com/910073 and so libjavacore no longer needs to
be linked to the conscrypt namespace.

Bug: 123744297
Test: m && flashall
Test: atest CtsLibcoreOkHttpTestCases
Test: atest CtsLibcoreTestCases
Change-Id: Id720b59e4ef42a2c0226b497a1cc3c54f7a837d0
2019-03-21 17:13:14 +00:00
Yurii Zubrytskyi
1265bc9c6f Merge "[base] Convert Starts/Ends/Equals string functions to string_view" 2019-03-21 17:08:48 +00:00
Peter Collingbourne
dba6d44376 libprocessgroup: Deliberately leak TaskProfiles and CgroupMap instances.
This avoids a race between destruction on process exit and concurrent
access from another thread.

Bug: 129023204
Change-Id: Iecafa67a78e2cce53687156e7f91547b4a23ec13
2019-03-21 17:00:48 +00:00
Nick Kralevich
104771e55e zip_archive.cc: delete android_errorWriteLog
The process of determining whether or not to emit a safetynet error
entry while processing a malformed file relies on addition overflow.
Since this is only logging, and logging which isn't used, delete the
code instead of trying to fix the logic which is causing the integer
overflow.

This change is necessary to enable integer sanitization on this code.

Somewhat related to Bug: 122975762
Test: atest ziparchive-tests

Change-Id: I6b41ccf7881348cb4e5236324eaa44a05662a725
2019-03-21 09:58:56 -07:00
Yurii Zubrytskyi
59d876c7a2 [base] Convert Starts/Ends/Equals string functions to string_view
Test: UTs

Change-Id: I3751656d44e7a814488169c53d3e8af0da44f262
2019-03-21 16:29:46 +00:00
Nick Kralevich
c5da03f448 entry_name_utils-inl.h: clear top bit before shifting
Attempting to shift a uint8_t which has the top bit set results in a
value outside of the range allowable for a uint8_t. The process of
converting this value back to a uint8_t triggers ubsan's
implicit-conversion sanitizer.

Ensure the high order bit is stripped before shifting, so that the
shifted value fits into the allowable uint8_t range.

This change is necessary to enable integer sanitization on this code.

Somewhat related to Bug: 122975762
Test: atest ziparchive-tests

Change-Id: I940c8b2828ac88348d80f731274b990e35de6631
2019-03-21 09:29:31 -07:00
Luke Huang
9f409f2e4c Enlarge cmd buffer size of FrameworkListener
Only Netd and Logd use FrameworkListener currently.
Run realted test to ensure anything are still fine.

Bug: 126307309
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass
      atest CtsLogdTestCases

Change-Id: Iacd0cc13f23f457a0868a8a706080c3edc9a3cbd
2019-03-21 23:09:16 +08:00
Vic Yang
60e3c55900 Merge "Add support for no-vendor-variant VNDK" am: c3e96512c0 am: 5e9c91c404
am: 1a41a41bcc

Change-Id: I13d4a8e9a97f6b229581f29400fbe50647f8fdde
2019-03-20 21:59:29 -07:00
Vic Yang
1a41a41bcc Merge "Add support for no-vendor-variant VNDK" am: c3e96512c0
am: 5e9c91c404

Change-Id: I63ecdc6bdc4f36fae0b13752f5b1f1f32555f88b
2019-03-20 21:47:41 -07:00
Vic Yang
5e9c91c404 Merge "Add support for no-vendor-variant VNDK"
am: c3e96512c0

Change-Id: Id4555b4727feb615b7e250ed2f0903380e87bd98
2019-03-20 21:37:18 -07:00
Vic Yang
c3e96512c0 Merge "Add support for no-vendor-variant VNDK" 2019-03-21 04:30:47 +00:00
David Anderson
ee725f610f init: Support booting off GSIs installed to non-userdata block devices.
Bug: 126230649
Bug: 127953521
Test: GSI boots when installed to sdcard on hikey960
      GSI boots when installed to /data/gsi
Change-Id: Id59926ebe363939c8c5745bb1bf5bd13722dae7e
2019-03-20 18:22:00 -07:00
Mark Salyzyn
92bfff3d95 Merge "bootstat: add 4 reboot reasons to known set" am: ddae5c85b9 am: 70c217439d
am: 691f132250

Change-Id: Ic9bb2c71828a5cfb91440769dbf06dcc062916d1
2019-03-20 18:12:33 -07:00
Mark Salyzyn
691f132250 Merge "bootstat: add 4 reboot reasons to known set" am: ddae5c85b9
am: 70c217439d

Change-Id: I179945a22104b136752d8a3ce0e41f4317e67905
2019-03-20 17:56:36 -07:00
Mark Salyzyn
70c217439d Merge "bootstat: add 4 reboot reasons to known set"
am: ddae5c85b9

Change-Id: Id37ef4b4146a4d16629d83c180e3b31194bb5a01
2019-03-20 17:42:14 -07:00
Mark Salyzyn
ddae5c85b9 Merge "bootstat: add 4 reboot reasons to known set" 2019-03-21 00:18:37 +00:00
Colin Cross
87315e9d2f Catch SIGBUS in HeapWalker
SIGBUS shouldn't happen, since all of the regions being walked
were previously read out of /prod/pid/maps, but it seems to happen
rarely.  Catch it so it can produce a better log message.

Bug: 128983715
Test: atest memunreachable_test
Change-Id: I82d3941a382a0451c0dda12f5eb849ad8d697bc9
2019-03-20 16:06:52 -07:00
Evgenii Stepanov
cb7f2dde10 Merge "Fix libmemunreachable vs hwasan conflict." am: b4ef0beb99 am: a3fea8c584
am: e69d53cf5a

Change-Id: I5098a9fb27fd0502efeb542a81669a6046bb3152
2019-03-20 13:06:40 -07:00
Nick Kralevich
30dec070dd libziparchive: add integer checks
The code in libziparchive has lots of questionable looking but not
obviously wrong integer operations. In order to shake out integer bugs
in libziparchive (for example, commit
1ee4892e66 from bug 31251826) and provide
protection against security bugs, enable some integer sanitization
options in libziparchive.

Bug: 122975762
Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=941802
Test: device boots and no obvious problems.
Change-Id: I215d81892a6eff12d692648c69a03e8200b334d7
2019-03-20 13:04:02 -07:00
Evgenii Stepanov
e69d53cf5a Merge "Fix libmemunreachable vs hwasan conflict." am: b4ef0beb99
am: a3fea8c584

Change-Id: I06d484a3cf48f5c3c6f21b7c3d84e6aa4353a6f6
2019-03-20 12:57:38 -07:00
Evgenii Stepanov
a3fea8c584 Merge "Fix libmemunreachable vs hwasan conflict."
am: b4ef0beb99

Change-Id: I8e90edb54f3b8ae2ae147da8f9e3a73718066e63
2019-03-20 12:53:39 -07:00
Evgenii Stepanov
b4ef0beb99 Merge "Fix libmemunreachable vs hwasan conflict." 2019-03-20 19:41:29 +00:00
Jeff Vander Stoep
41962bbf0a Merge "init: make sepolicy dependency optional" am: ee3cce8b7b am: 5aa734730f
am: a353a1f849

Change-Id: Ib8dc89c71a7a4f1800f5cd6e5a14f4a048d5fa4c
2019-03-20 10:07:23 -07:00
Jeff Vander Stoep
a353a1f849 Merge "init: make sepolicy dependency optional" am: ee3cce8b7b
am: 5aa734730f

Change-Id: I43d92796ca3d91dfba93460b841c66783a133c84
2019-03-20 09:59:12 -07:00
Jeff Vander Stoep
5aa734730f Merge "init: make sepolicy dependency optional"
am: ee3cce8b7b

Change-Id: I1002c01b039b0b7458b906c48d87805d03aea8ba
2019-03-20 09:55:59 -07:00
Jone Chou
d51036d641 bootstat: add 4 reboot reasons to known set
- reboot,rtc
- reboot,dm-verity_device_corrupted
- reboot,dm-verity_enforcing
- reboot,keys_clear

Test: none
Bug: 128929506
Bug: 128929604
Change-Id: I5438c236abb67b74c7b9d717930c0ea69f70540d
Signed-off-by: Jone Chou <jonechou@google.com>
2019-03-20 16:53:29 +00:00
Treehugger Robot
ee3cce8b7b Merge "init: make sepolicy dependency optional" 2019-03-20 16:42:29 +00:00
Mark Salyzyn
dd258f965c Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" am: 4dd15cbe24 am: ad0c249149
am: 77d23396ab

Change-Id: I2cccb4bbd16ee9212c99edc2b8739e05d935060a
2019-03-20 09:31:54 -07:00
Mark Salyzyn
77d23396ab Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" am: 4dd15cbe24
am: ad0c249149

Change-Id: I8a8c14cbcc00e79e8640fca0e0680f7a9d966e3e
2019-03-20 09:17:50 -07:00
Mark Salyzyn
ad0c249149 Merge "fs_mgr: remount: manufacture a missing / entry for default fstab"
am: 4dd15cbe24

Change-Id: Id80d8de5c7b30e130c512a6ce23beb69c5bff816
2019-03-20 09:08:05 -07:00
Treehugger Robot
4dd15cbe24 Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" 2019-03-20 15:01:16 +00:00
Jone Chou
508e615b8e bootstat: add 4 reboot reasons to known set
- reboot,rtc
- reboot,dm-verity_device_corrupted
- reboot,dm-verity_enforcing
- reboot,keys_clear

Test: none
Bug: 128929506
Bug: 128929604
Change-Id: I5438c236abb67b74c7b9d717930c0ea69f70540d
Signed-off-by: Jone Chou <jonechou@google.com>
2019-03-20 19:44:20 +08:00
dimitry
e3d0383d38 Add dependency on libdl_android
platform private symbols have been moved to libdl_android.so
since they are not intended to be accessible from apps.

Test: make
Change-Id: I883a6d2ca588a258dd43efa766fad4e07428594e
2019-03-20 12:26:41 +01:00
Hridya Valsaraju
471ff5ddc2 Merge "Add more tests for dynamic partitions" am: 6bddf40d31 am: 21c8507179
am: 2a6b12adcb

Change-Id: Id7ad5059a27c61166d32f09a45995689791c47d4
2019-03-19 22:00:14 -07:00
Hridya Valsaraju
de4fa669e7 Merge "Add a test for logical partitions." am: b0f125d581 am: 6d0e0ecb1e
am: e415cc13a5

Change-Id: I66231054efb3960d4606fd4965297885fe765f5b
2019-03-19 21:58:51 -07:00
Hridya Valsaraju
2a6b12adcb Merge "Add more tests for dynamic partitions" am: 6bddf40d31
am: 21c8507179

Change-Id: I0a15c5b2376b9e7176d01a18be6bf3391de5e45c
2019-03-19 21:51:37 -07:00
Hridya Valsaraju
e415cc13a5 Merge "Add a test for logical partitions." am: b0f125d581
am: 6d0e0ecb1e

Change-Id: I794f16b99bd3f22fdf103eeecd2b9974ada478c1
2019-03-19 21:50:38 -07:00