Commit graph

65121 commits

Author SHA1 Message Date
Treehugger Robot
65da89e71a Merge "Follow vdc naming convention: earlyBootEnded" am: 0029d3f6c0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1512479

Change-Id: I186b797a3c138e830c7aeabf6583575104dd21a0
2020-12-02 08:20:27 +00:00
Treehugger Robot
0029d3f6c0 Merge "Follow vdc naming convention: earlyBootEnded" 2020-12-02 07:49:38 +00:00
Wei Wang
75175b6050 Merge "rootdir/init.rc: Create camera-daemon groups" am: 84719713c7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1512950

Change-Id: Ife9fb8605c18ac25e569472666934913c8fc5cb5
2020-12-02 04:02:19 +00:00
Wenhao Wang
c58d20321a Merge "trusty-ut-ctrl: Make it as binary" am: 36d45bbfd5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1496887

Change-Id: Ifdfe4bb51a233606ecdf06b96dcc7d00165ca585
2020-12-02 03:57:46 +00:00
Wei Wang
84719713c7 Merge "rootdir/init.rc: Create camera-daemon groups" 2020-12-02 03:38:01 +00:00
Wenhao Wang
36d45bbfd5 Merge "trusty-ut-ctrl: Make it as binary" 2020-12-02 03:28:58 +00:00
Kiyoung Kim
6333a022b3 Merge "Remove provide libs from file" am: e11663f483
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1498488

Change-Id: Iab2a52ea955fbb39b7d1ed4b7e53fe3e71a108ac
2020-12-02 01:47:20 +00:00
Kiyoung Kim
e11663f483 Merge "Remove provide libs from file" 2020-12-02 00:28:25 +00:00
Paul Crowley
3fe1a8c76c Follow vdc naming convention: earlyBootEnded
vdc commands use camelCase, not kebab-case.

Test: EarlyBootKeyTest.CannotCreateEarlyBootKeys
Change-Id: I5bcc9c435c848f5054e81ffaf87ae32577548570
2020-12-01 14:37:48 -08:00
Treehugger Robot
e52cdbc760 Merge changes Ie9da525c,I9911f02c,Iad18af1f,I5f432a3d am: 41c2e6286e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506636

Change-Id: Ibb572370e1fe3daeb242916b4a8c28713f5544bb
2020-12-01 20:35:05 +00:00
Treehugger Robot
41c2e6286e Merge changes Ie9da525c,I9911f02c,Iad18af1f,I5f432a3d
* changes:
  trusty: provide coverage to gatekeeper fuzzer
  trusty: fuzz: Example TA fuzzer
  trusty: fuzz: Helper lib for libFuzzer extra counters
  trusty: coverage: Coverage client library
2020-12-01 20:20:08 +00:00
Hamzeh Zawawy
da2960df35 Merge "Resolved UAF issue in RefBase fuzzer" am: 9a79c84499
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1424812

Change-Id: I56c806c76dae6cf152a4d039341d373c039e83ce
2020-12-01 18:42:05 +00:00
Hamzeh Zawawy
9a79c84499 Merge "Resolved UAF issue in RefBase fuzzer" 2020-12-01 18:24:27 +00:00
Tom Cherry
5a6578b7bd Merge "Revert "Ramdisk: add metadata dir in ramdisk"" am: 456397830d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513652

Change-Id: Ibe708ae3e71000f23079ea824001cb459bc86e13
2020-12-01 18:13:13 +00:00
Tom Cherry
9ed5699204 Merge "fs_mgr: move mkdir(mount_point) to prepare_fs_for_mount()" am: a1411e4311
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1505939

Change-Id: I668988203c70c564917dfb37749c672008cfb1d3
2020-12-01 18:04:55 +00:00
Tom Cherry
456397830d Merge "Revert "Ramdisk: add metadata dir in ramdisk"" 2020-12-01 17:36:42 +00:00
Tom Cherry
a1411e4311 Merge "fs_mgr: move mkdir(mount_point) to prepare_fs_for_mount()" 2020-12-01 17:36:31 +00:00
Rick Yiu
a983f8ab1e rootdir/init.rc: Create camera-daemon groups
In task_profiles.json, camera-daemon is referred for both cpu and
cpuset controller, so create them in init.rc officially.

Test: build pass
Bug: 170507876
Change-Id: I655154ab739ffde6fdfd2d499cbaa974597d3ee7
2020-12-01 15:45:01 +08:00
jiazi li
18778cd5f9 Revert "Ramdisk: add metadata dir in ramdisk"
This reverts commit 9fa773746c.

Reason for revert: using aosp/1505939 instead

Change-Id: I4c654e5b77b0e5ffac036fe0674f201f2ae19fb6
2020-12-01 06:19:54 +00:00
Tri Vo
a1008a1edf trusty: provide coverage to gatekeeper fuzzer
Bug: 171750250
Test: /data/fuzz/arm64/trusty_gatekeeper_fuzzer/trusty_gatekeeper_fuzzer
Change-Id: Ie9da525c0dcb6c9c5ed2f50396c0065e3a567d22
2020-11-30 20:09:08 -08:00
Tri Vo
680fc001b8 trusty: fuzz: Example TA fuzzer
Bug: 169776499
Test: /data/fuzz/arm64/trusty_test_fuzzer/trusty_test_fuzzer
Change-Id: I9911f02cb49c39f1c3cd89b4e5582e8dfaa645d1
2020-11-30 20:09:07 -08:00
Tri Vo
a67840f998 trusty: fuzz: Helper lib for libFuzzer extra counters
Bug: 169776499
Test: /data/nativetest64/libtrusty_coverage_test/libtrusty_coverage_test
Change-Id: Iad18af1f0404fc47bef481955c7a4292ef3a24ec
2020-11-30 20:09:02 -08:00
Tri Vo
5b40e89894 trusty: coverage: Coverage client library
Bug: 169776499
Test: /data/nativetest64/libtrusty_coverage_test/libtrusty_coverage_test
Change-Id: I5f432a3df04fe7b0e2940a12f8d28b3d0655791f
2020-11-30 19:39:00 -08:00
Kiyoung Kim
344b46a5b3 Remove provide libs from file
Remove provide libs of system image from file, and generate it at build
time instead

Bug: 172889962
Test: Build cuttlefish and confirmed list is generated in
/system/etc/linker.config.pb

Change-Id: I365252dcb2e8735fd8f6345c9ec2c985b0489d64
2020-12-01 10:41:09 +09:00
Dylan Katz
55107c195d Resolved UAF issue in RefBase fuzzer
Restrucures this fuzzer to be far more robust and less brittle.
Fix: 163727995
Fix: 163449137
Test: libutils_fuzz_refbase clusterfuzz-testcase-minimized-libutils_fuzz_refbase-5674315436261376
Test: libutils_fuzz_refbase clusterfuzz-testcase-minimized-libutils_fuzz_refbase-5731662044069888
Test: libutils_fuzz_refbase clusterfuzz-testcase-minimized-libutils_fuzz_refbase-5081777218256896

Signed-off-by: Dylan Katz <dylan.katz@leviathansecurity.com>
Change-Id: I239298dc2895a06af5a126e9ca2ae452579e5cc0
2020-11-30 16:18:27 -08:00
Christopher Ferris
df373f6e5d Merge "Adjust to MapInfo to new api." am: 8255631fa9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1509951

Change-Id: I5390e1a6f86a8d4c517f15742ed758dbb12873c4
2020-11-30 21:09:26 +00:00
Christopher Ferris
8255631fa9 Merge "Adjust to MapInfo to new api." 2020-11-30 20:42:58 +00:00
Wenhao Wang
e29076bc15 Merge "trusty: Fuzzer for Confirmationui TA" am: b0db51d36e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513530

Change-Id: I6262d164e1287992c2b00b2a2447f342b2b93fcf
2020-11-30 00:43:45 +00:00
Wenhao Wang
b0db51d36e Merge "trusty: Fuzzer for Confirmationui TA" 2020-11-30 00:17:46 +00:00
Wenhao Wang
0124a59fe4 trusty: Fuzzer for Confirmationui TA
Note: We need to add Confirmationui TA into
TRUSTY_BUILTIN_USER_TASKS to run the fuzzer.

Bug: 174402999
Bug: 171750250
Test: /data/fuzz/arm64/trusty_confirmationui_fuzzer/trusty_confirmationui_fuzzer
Change-Id: I22769782ded05eeedeb111f7537b5ba76e98ce73
2020-11-29 13:03:55 -08:00
Tom Cherry
b5ea0afe31 Merge "init: add some documentation in service_utils.h" am: f28a60413c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1510468

Change-Id: I8d9225230a00bec5ab2fbf9f6bb83c44f15722bb
2020-11-25 14:43:29 +00:00
Tom Cherry
f28a60413c Merge "init: add some documentation in service_utils.h" 2020-11-25 14:18:11 +00:00
Tri Vo
0b1ef96898 Merge changes Id77b87bb,I56a15c80 am: 9763f21565
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1504100

Change-Id: I2a538361453c7f5039b810d63b9e68b1323cd454
2020-11-24 20:50:48 +00:00
Tri Vo
9763f21565 Merge changes Id77b87bb,I56a15c80
* changes:
  trusty: fuzz: make utils lib use libtrusty_test
  trusty: Add libtrusty_test
2020-11-24 20:39:26 +00:00
Tom Cherry
c9bc6bb436 init: add some documentation in service_utils.h
Test: n/a
Change-Id: I2a2691a6d1f643e255550498d9871e38f1b51efa
2020-11-24 11:34:40 -08:00
David Srbecky
8efcd6325c Adjust to MapInfo to new api.
Change-Id: Ic3818a8b001657e6b54ba6fcbf68f8c1d7ef2683
2020-11-24 17:27:05 +00:00
Suren Baghdasaryan
ccc41dd652 Merge "libprocessgroup: Support per-API level task profiles" am: 180b2671cc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507918

Change-Id: Id626abe4de8467791f83a47c50444ce4073ec4d1
2020-11-24 05:40:37 +00:00
Suren Baghdasaryan
180b2671cc Merge "libprocessgroup: Support per-API level task profiles" 2020-11-24 05:12:01 +00:00
Suren Baghdasaryan
35221b5338 libprocessgroup: Support per-API level task profiles
When task profiles changes happen, devices released under older API
levels might have to use the same profiles as before. This might be
due to for missing kernel features or some other reasons. Add support
for per-API task profiles to accommodate this scenario. With this
mechanism when ro.product.first_api_level is non-empty, the system
looks for /system/etc/profiles/task_profiles_<api level>.json file
and uses it if it exists. If ro.product.first_api_level is not defined
or per-API task profiles file does not exist the system falls back to
the default /system/etc/profiles/task_profiles.json file.
As before, these task profiles can be competely overwritten using
/vendor/etc/task_profiles.json if needed.

Bug: 172066799
Test: boot with per-API task profiles
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I1671b341b3a0fb5e99d0b0788315c61088326b09
2020-11-23 22:08:41 +00:00
David Anderson
b3c774e646 Merge "libsnapshot: Build snapuserd and its dependencies into vendor_ramdisk." am: 03f4504ffd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1501610

Change-Id: Ida641fcf4e31f8c81a05fa99d37cd6c0d371f822
2020-11-23 21:38:07 +00:00
David Anderson
03f4504ffd Merge "libsnapshot: Build snapuserd and its dependencies into vendor_ramdisk." 2020-11-23 21:18:07 +00:00
David Anderson
61714d22dd Merge changes Ibeffa4a3,Ibce3bac9 am: d9a6144435
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507551

Change-Id: I360484df0d65534d64415083b390f8b7bcc5c1d2
2020-11-23 21:04:43 +00:00
Tri Vo
90c0e833c9 trusty: fuzz: make utils lib use libtrusty_test
Test: m libtrusty_fuzz_utils
Change-Id: Id77b87bb14f09b29f53c78a4ea89073fbe1c83a1
2020-11-23 12:57:44 -08:00
David Anderson
d9a6144435 Merge changes Ibeffa4a3,Ibce3bac9
* changes:
  libsnapshot: Add a way to detach snapuserd.
  libsnapshot: Remove special-case code for first-stage init.
2020-11-23 20:15:56 +00:00
David Anderson
4902c90f75 Merge changes Ice594cce,I9a87f988 am: d7f31801c0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507922

Change-Id: I2dff7e25574dca6efc46f72b8dfbd416f1447b48
2020-11-23 18:54:23 +00:00
David Anderson
d7f31801c0 Merge changes Ice594cce,I9a87f988
* changes:
  init: Fix ordering of second-stage snapuserd transition.
  init: Pass a uevent regen callback to libsnapshot.
2020-11-23 18:24:38 +00:00
Rick Yiu
609c77f727 Merge "rootdir/init.rc: Remove duplicated settings" am: e3d0307e34
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506808

Change-Id: I725c19e7b7b578d1584be3d3fc0927abc89f7dba
2020-11-23 14:25:43 +00:00
Rick Yiu
e3d0307e34 Merge "rootdir/init.rc: Remove duplicated settings" 2020-11-23 13:48:31 +00:00
Rick Yiu
1848e5e69c rootdir/init.rc: Remove duplicated settings
Bug: 170507876
Test: build pass
Change-Id: I2cfa886eb84982f03df9bf0db95dc1aae2117418
2020-11-23 07:29:55 +00:00
Akilesh Kailash
1eb9b6cd21 Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac08
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507553

Change-Id: I39123a9f916ac3cb82888405f5f8a49ebc8f93b7
2020-11-23 07:03:23 +00:00