Commit graph

81795 commits

Author SHA1 Message Date
Paul Lawrence
90879edeea Listen on property_service_for_system socket
It is easy to dos the property_service socket, since it will wait for a
complete data packet from one command before moving on to the next one.
To prevent low privilege apps interfering with system and root apps,
add a second property_service socket that only they can use

Bug: 262237198
Test: Run POC in one shell, set properties as root and system in another
Ignore-AOSP-First: Security fix
Change-Id: I1d6fec833fc24352546bb90f770d3c4b675f5716
2023-01-27 11:24:23 -08:00
Samip Garg
f044061d70 [automerger skipped] Snap tm-dev to android13-tests-dev am: fc0ee916bc am: c392840ee1 -s ours
am skip reason: Merged-In I1795c931b28fd5fe28aa0f23717d4238fb352d37 with SHA-1 bfd3e38284 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20931965

Change-Id: I7ce5926aa83f91b977c01e9cfcbdca25667d68ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 22:31:53 +00:00
Treehugger Robot
7e80a11972 Merge "Pass fault address to GWP-ASan's changed API." am: a812f45678 am: 5e8b596f13 am: 3f399776e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385373

Change-Id: I3b436eb3b10a382d3c31923ddae4fe8636e9c25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 22:31:16 +00:00
Treehugger Robot
3f399776e6 Merge "Pass fault address to GWP-ASan's changed API." am: a812f45678 am: 5e8b596f13
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385373

Change-Id: I72c55ea5788981d29f2f52a3a72c38f9679b9dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 21:31:14 +00:00
Treehugger Robot
c07bab6cb5 Merge "TEST_MAPPING: add vts core lib tests" am: aaa402ae6a am: 3960126eb1 am: ce3a092e46
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2381872

Change-Id: I096f4c670c5ffe4799002a8b1f6b26f14acaaaf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 21:11:23 +00:00
Treehugger Robot
5e8b596f13 Merge "Pass fault address to GWP-ASan's changed API." am: a812f45678
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385373

Change-Id: I2b6e23cde0555fe4ed79098f5cb067ceec5ef381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 20:57:14 +00:00
Treehugger Robot
a812f45678 Merge "Pass fault address to GWP-ASan's changed API." 2023-01-17 20:29:46 +00:00
Treehugger Robot
ce3a092e46 Merge "TEST_MAPPING: add vts core lib tests" am: aaa402ae6a am: 3960126eb1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2381872

Change-Id: Ia5c02aac25a6733b32d50d439da1100c613cf146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 19:45:16 +00:00
Treehugger Robot
3960126eb1 Merge "TEST_MAPPING: add vts core lib tests" am: aaa402ae6a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2381872

Change-Id: I24401aceec6df48a83eab4c99cfc37c03a2e8f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 19:10:56 +00:00
Treehugger Robot
aaa402ae6a Merge "TEST_MAPPING: add vts core lib tests" 2023-01-17 18:40:24 +00:00
Samip Garg
be3e870527 [automerger skipped] Snap tm-dev to android13-tests-dev am: fc0ee916bc am: 118a97fb5a am: d7918fad81 -s ours am: 9ed1ba81af -s ours
am skip reason: Merged-In I1795c931b28fd5fe28aa0f23717d4238fb352d37 with SHA-1 bfd3e38284 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20514427

Change-Id: Ifaa6cc75aa8734c223b708ac68639e9efd3487f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16 05:02:24 +00:00
Samip Garg
9ed1ba81af [automerger skipped] Snap tm-dev to android13-tests-dev am: fc0ee916bc am: 118a97fb5a am: d7918fad81 -s ours
am skip reason: Merged-In I1795c931b28fd5fe28aa0f23717d4238fb352d37 with SHA-1 bfd3e38284 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20514427

Change-Id: I618ee5f335d72e091ecfae77d22bdbbe911513a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16 04:13:45 +00:00
Samip Garg
d7918fad81 Snap tm-dev to android13-tests-dev am: fc0ee916bc am: 118a97fb5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20514427

Change-Id: I75805d3c8aa574ef5f88118c68748c7a1f999eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16 04:00:03 +00:00
Treehugger Robot
68199167ba Merge "init: Make console a shutdown critical service" am: c332f33187 am: 5d8c3f30d9 am: 76f9ea9921
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385300

Change-Id: I65c43e9bf4685095efa77d8ac2e810d14b1fc565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 22:55:10 +00:00
Treehugger Robot
76f9ea9921 Merge "init: Make console a shutdown critical service" am: c332f33187 am: 5d8c3f30d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385300

Change-Id: Ia6f35e3e3f426495da9fc47f6aa6093e366e128c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 22:16:04 +00:00
Treehugger Robot
5d8c3f30d9 Merge "init: Make console a shutdown critical service" am: c332f33187
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385300

Change-Id: I6eb59b9b831b30d5905474a4948176a3f9ec862b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 21:39:05 +00:00
Treehugger Robot
c332f33187 Merge "init: Make console a shutdown critical service" 2023-01-13 21:10:22 +00:00
Florian Mayer
86f4951493 Merge "Handle scudo_ring_buffer_size = 0" am: cad7f577d1 am: ca83d5092b am: 5edf44e021
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385374

Change-Id: I5591dd392b80d308a60aa05190aeb366678af698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 20:08:11 +00:00
Florian Mayer
5edf44e021 Merge "Handle scudo_ring_buffer_size = 0" am: cad7f577d1 am: ca83d5092b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385374

Change-Id: I834a9d25a486d08d49e4cc70317615b80ad54b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 19:11:19 +00:00
Florian Mayer
ca83d5092b Merge "Handle scudo_ring_buffer_size = 0" am: cad7f577d1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385374

Change-Id: I32b30acf284958c3ee3f7161bf9f8a8ac2614809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 18:34:13 +00:00
Florian Mayer
cad7f577d1 Merge "Handle scudo_ring_buffer_size = 0" 2023-01-13 17:54:50 +00:00
Akilesh Kailash
69e6289abc Merge "init: Wait for daemon to fully spin up all threads" am: 545870e53a am: 3aabed9e77 am: 3726d0de46
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2373312

Change-Id: I27fcda71d877f83348e57441fa6c2925e8c56e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 08:37:29 +00:00
Akilesh Kailash
3726d0de46 Merge "init: Wait for daemon to fully spin up all threads" am: 545870e53a am: 3aabed9e77
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2373312

Change-Id: I6e6155d8c3c7ec7a14c159db6218ef50e23ef9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 07:59:03 +00:00
Akilesh Kailash
3aabed9e77 Merge "init: Wait for daemon to fully spin up all threads" am: 545870e53a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2373312

Change-Id: Ic0f33ab2ebd10821822783dffd02b483a968c7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 07:08:37 +00:00
Akilesh Kailash
545870e53a Merge "init: Wait for daemon to fully spin up all threads" 2023-01-13 06:35:33 +00:00
Treehugger Robot
f54661b503 Merge "fastboot: Copy AVB footer from recovery.img to the end of the partition" am: d5d01db888 am: 25da4b30af am: 8c45d05d88
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385299

Change-Id: I2d042cafa96ec60e30ec5da6fdd8278a8207954f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 04:17:31 +00:00
Treehugger Robot
8c45d05d88 Merge "fastboot: Copy AVB footer from recovery.img to the end of the partition" am: d5d01db888 am: 25da4b30af
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385299

Change-Id: Ib563a684286ac5a66484abcfd61fe43ef563d529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 03:04:35 +00:00
Treehugger Robot
25da4b30af Merge "fastboot: Copy AVB footer from recovery.img to the end of the partition" am: d5d01db888
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385299

Change-Id: I13ca5b497bb3e03d055d74b9bb465bf072b1ad6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 00:59:30 +00:00
Samip Garg
c392840ee1 Snap tm-dev to android13-tests-dev am: fc0ee916bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20514427

Merged-In: I1795c931b28fd5fe28aa0f23717d4238fb352d37
Change-Id: I3a87ba88e502cdc65e51573848075d95a5f04c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 00:54:35 +00:00
Gabriel Jacobo
12f9ff8951 init: Make console a shutdown critical service
A critical shutdown service is one that stays on right until the system
is rebooted. In order to be able to capture kernel messages right until
reboot this is required, otherwise after the console service is
terminated some messages can be lost.

Test: Reboot and verify messages show up on serial further down the reboot process
Change-Id: Iea58b5a76afe45b3346803021e3be81742b02ea0
2023-01-12 16:46:38 -08:00
Florian Mayer
30a25286c4 Handle scudo_ring_buffer_size = 0
Bug: 263287052
Change-Id: I0bec3a817d7a16c72d5dfeddd0dcc86830f5a311
2023-01-12 16:06:10 -08:00
Treehugger Robot
d5d01db888 Merge "fastboot: Copy AVB footer from recovery.img to the end of the partition" 2023-01-13 00:04:58 +00:00
David Anderson
818c10ab7a Merge "init: Allow persistent properties to be written asynchronously." am: 9b9924b412 am: 9b9f6a0b86 am: 8b12b8ac76
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2243614

Change-Id: I387baa427e33a84d3faacdb3a53640db85f165c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 23:36:03 +00:00
David Anderson
8b12b8ac76 Merge "init: Allow persistent properties to be written asynchronously." am: 9b9924b412 am: 9b9f6a0b86
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2243614

Change-Id: I37cb5292759941e080ce703d7ae95c2ca553cfa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 22:56:27 +00:00
Isaac J. Manjarres
acb49528a7 fastboot: Copy AVB footer from recovery.img to the end of the partition
Copy the AVB footer of the recovery.img to the end of the recovery
partition, so that it can be found when loading a recovery image
from a partition that is larger than the image.

Bug: 261673286
Test: m and flashing recovery image and bootloader can now detect
AVB footer.
Change-Id: Ib93da33c72f3a96eb8d9bcedaab5ef0c3a4d418d
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
2023-01-12 14:33:56 -08:00
David Anderson
9b9f6a0b86 Merge "init: Allow persistent properties to be written asynchronously." am: 9b9924b412
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2243614

Change-Id: I8c95ba0e912393eb8628efba8fdca38b21b5bb2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 22:18:48 +00:00
David Anderson
9b9924b412 Merge "init: Allow persistent properties to be written asynchronously." 2023-01-12 21:50:42 +00:00
TreeHugger Robot
28a80249db [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 2583851130 -s ours am: d44274770a -s ours
am skip reason: Merged-In I9b1408b72df34a0d0cbcc1b99e9617f15bc47558 with SHA-1 4762c22aba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20948830

Change-Id: Idc454c8ea15725df9f1e80c01338c35329043c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 21:10:29 +00:00
Xin Li
f6339aeef9 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: cc12c699a1 -s ours am: 180a611314 -s ours
am skip reason: Merged-In I9b1408b72df34a0d0cbcc1b99e9617f15bc47558 with SHA-1 4762c22aba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20948830

Change-Id: If1b6df9e625bfe416625c189e452dba60a7ebca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 21:09:28 +00:00
TreeHugger Robot
d44274770a [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 2583851130 -s ours
am skip reason: Merged-In I9b1408b72df34a0d0cbcc1b99e9617f15bc47558 with SHA-1 4762c22aba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20948830

Change-Id: I3a5f028798cf85f5751fee9dfbe149ce3f0c50f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 20:06:41 +00:00
Xin Li
180a611314 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: cc12c699a1 -s ours
am skip reason: Merged-In I9b1408b72df34a0d0cbcc1b99e9617f15bc47558 with SHA-1 4762c22aba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20948830

Change-Id: Icd3b3d4543b44eb6d712a435c67641633bc452f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 20:05:42 +00:00
Elliott Hughes
6efbb57193 Merge "mkbootfs: consistency." am: beeef8c01a am: 877bd271be am: b0a081e7cd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385294

Change-Id: If4f09a6e5c5961e6897b4a8835e8f2aab6d1ac89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 19:30:47 +00:00
TreeHugger Robot
2583851130 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-12 19:25:27 +00:00
Elliott Hughes
b0a081e7cd Merge "mkbootfs: consistency." am: beeef8c01a am: 877bd271be
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385294

Change-Id: Id76d707abaf3727751a18ef8fdb1544d77788ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 18:28:54 +00:00
Elliott Hughes
877bd271be Merge "mkbootfs: consistency." am: beeef8c01a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385294

Change-Id: I4595b72d9e283442cb90cb9bc832a5d65ba1268a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 17:51:52 +00:00
Mitch Phillips
8a34b179ad Pass fault address to GWP-ASan's changed API.
GWP-ASan changed one of the APIs upstream to now take the fault address
as well. This is to support the recoverable mode.

Add the fault address as well.

Test: gwp_asan_unittest
Bug: N/A
Change-Id: I8a4edd3fad159d91cc036050d330bbb8f9c8d435
2023-01-12 09:48:11 -08:00
Elliott Hughes
beeef8c01a Merge "mkbootfs: consistency." 2023-01-12 17:02:53 +00:00
David Drysdale
b28ea7d1fd Merge "Helper for setting attestation IDs" am: 82ef14bf76 am: e8aaa7f269 am: ba53913661
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2380168

Change-Id: I7bdda071ac912417761876d7bd4277e0d24f0710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 08:35:39 +00:00
Treehugger Robot
b5ccc995ba Merge "usb: migration to USB gadget AIDL" am: 52d91b3fc0 am: 761dffd8aa am: 16ba9d1de4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2340891

Change-Id: I543c42786ea2c242d0fdd2c7b186f42a98f415e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 08:29:44 +00:00
David Drysdale
ba53913661 Merge "Helper for setting attestation IDs" am: 82ef14bf76 am: e8aaa7f269
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2380168

Change-Id: Ia802943f05c0ee11b78bd8433296d3c54a946238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 07:50:41 +00:00