ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
67483 commits 1 branch 0 tags 217 MiB
Commit graph

67483 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikita Ioffe
7ba5030dcc Fix potential use-after-free bug in reboot 
Instead of operating on raw pointers, init now uses name of the
services as it's primary identifier. Only place that still uses
vector<Service*> is StopServices.

In addition, ServiceList::services() function is removed, which should
help avoiding similar bugs in the future.

Bug: 170315126
Bug: 174335499
Test: adb reboot
Test: atest CtsInitTestCases
Change-Id: I73ecd7a8c58c2ec3732934c595b7f7db814b7034
Merged-In: I73ecd7a8c58c2ec3732934c595b7f7db814b7034
Ignore-AOSP-First: fixing security vulnerability
(cherry picked from commit 8d6ae2dd8a)
 2020-12-02 16:11:22 +00:00
Treehugger Robot
c894412717 Merge "Follow vdc naming convention: earlyBootEnded" am: 0029d3f6c0 am: 65da89e71a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1512479

Change-Id: I43403949cb0696ff7168f3637f21d533c4188925
 2020-12-02 08:57:03 +00:00
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
be515e5c76 Merge "rootdir/init.rc: Create camera-daemon groups" am: 84719713c7 am: 75175b6050 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1512950

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

Change-Id: I2a23933fddb91556f210f8b3b9d62b681351c1a8
 2020-12-02 04:20:25 +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
5d7d398f8f Merge "Remove provide libs from file" am: e11663f483 am: 6333a022b3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1498488

Change-Id: If4f9b0ff992b6b3dc53f6b5d043241104b14ff49
 2020-12-02 02:04:38 +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
d759ed844f Merge changes Ie9da525c,I9911f02c,Iad18af1f,I5f432a3d am: 41c2e6286e am: e52cdbc760 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506636

Change-Id: I859cfb276c17863dd69998aa9a248915733b698f
 2020-12-01 22:26:05 +00: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
5a8869456e Merge "Resolved UAF issue in RefBase fuzzer" am: 9a79c84499 am: da2960df35 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1424812

Change-Id: I64785b4b385d9b65a71d6b8cbf316b4b89df6a58
 2020-12-01 18:58:17 +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
616a325593 Merge "Revert "Ramdisk: add metadata dir in ramdisk"" am: 456397830d am: 5a6578b7bd 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513652

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

Change-Id: I0cdaa53787b0b2ebd4082950a33e7d43e958dd38
 2020-12-01 18:21:53 +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
f23bb0a4df Merge "Adjust to MapInfo to new api." am: 8255631fa9 am: df373f6e5d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1509951

Change-Id: I584e0afe94985d9decf915131796a8a53be67cc3
 2020-11-30 21:29:04 +00: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
de50d73084 Merge "trusty: Fuzzer for Confirmationui TA" am: b0db51d36e am: e29076bc15 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513530

Change-Id: Iabf5e7012552ee24468cee401bad3ae6ee410a7d
 2020-11-30 01:06:15 +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
812fa93bb1 Merge "init: add some documentation in service_utils.h" am: f28a60413c am: b5ea0afe31 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1510468

Change-Id: I7e25e6adad1e0f86a8e04ade8e053eab86c5d5f3
 2020-11-25 15:45:09 +00: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
21f503b3fc Merge changes Id77b87bb,I56a15c80 am: 9763f21565 am: 0b1ef96898 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1504100

Change-Id: I09c9f01c24eb0944e2410136d9f3834fd65f5598
 2020-11-24 21:19:06 +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
3d23c4c3f4 Merge "libprocessgroup: Support per-API level task profiles" am: 180b2671cc am: ccc41dd652 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507918

Change-Id: I1830eda88ae040f6fb513fbbc80c2e3c772ea90e
 2020-11-24 06:35:37 +00:00