Commit graph

78686 commits

Author SHA1 Message Date
David Anderson
14ba0cdb56 Merge "init: Statically link libbootloader_message." am: aaa16bbad4 am: d30c5df76f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240121

Change-Id: I0f5815ad40043e118d6e95f5165bf105c01c4911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 17:38:15 +00:00
David Anderson
d30c5df76f Merge "init: Statically link libbootloader_message." am: aaa16bbad4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240121

Change-Id: Id215c3813f82fc7231c9b784efd36a189c12003e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 17:04:51 +00:00
David Anderson
aaa16bbad4 Merge "init: Statically link libbootloader_message." 2022-10-04 16:32:50 +00:00
Yi-yo Chiang
0e1b203415 Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e am: d7d2bab857
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: I220794aa0c5f3c0d11d8be6039ac02a7a853fb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 07:24:14 +00:00
Yi-yo Chiang
d7d2bab857 Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: I36109eedbf286f35b36373845a60c89f54da2880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 06:52:17 +00:00
Yi-yo Chiang
7214c98d2e Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" 2022-10-04 06:27:27 +00:00
David Anderson
12e53bc350 init: Statically link libbootloader_message.
This is to resolve idiosyncracies with test packaging.

Bug: 244284630
Test: ldd -d -r CtsInitTestCases
Change-Id: Iec2c14c3ca5cd359b79d9e1f12e689c0eeffb122
2022-10-03 21:37:56 -07:00
Florian Mayer
f631982e65 Merge "[MTE] add device config for permissive mode" am: 0b2cf1d6ec am: 87fa70eee3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219637

Change-Id: I502104387cb8697b4be9386604055771b18364d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 22:05:41 +00:00
Florian Mayer
87fa70eee3 Merge "[MTE] add device config for permissive mode" am: 0b2cf1d6ec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219637

Change-Id: Ief986a852344646f3331c3b489942ce3c2cfd79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 21:33:35 +00:00
Treehugger Robot
055cddda0c Merge "[MTE] Reset MTE state for userdata wipe in fastbootd" am: d07f11168b am: f6bc9f0c0e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2217197

Change-Id: I4d90ffb8c02f6b120fd6f0e96d971e5cba42b747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 21:07:08 +00:00
Florian Mayer
0b2cf1d6ec Merge "[MTE] add device config for permissive mode" 2022-10-03 21:04:24 +00:00
Treehugger Robot
f6bc9f0c0e Merge "[MTE] Reset MTE state for userdata wipe in fastbootd" am: d07f11168b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2217197

Change-Id: I971b8eb021e21345a844833b6674c988c5d9dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 20:10:03 +00:00
Treehugger Robot
63d5227282 Merge "bootstat: remove unused FDE boot events" am: 6e74f8c4a6 am: 2e13ea6fcd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2232787

Change-Id: I719b3d5e520efcba180741d210a980cbbe8f109c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 19:56:55 +00:00
Treehugger Robot
d07f11168b Merge "[MTE] Reset MTE state for userdata wipe in fastbootd" 2022-10-03 19:39:33 +00:00
Treehugger Robot
2e13ea6fcd Merge "bootstat: remove unused FDE boot events" am: 6e74f8c4a6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2232787

Change-Id: Ibbdfe2b696bd2ae5ad2ec90878760c4ff7c798b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 19:25:15 +00:00
Treehugger Robot
6e74f8c4a6 Merge "bootstat: remove unused FDE boot events" 2022-10-03 18:46:56 +00:00
Florian Mayer
5197e9722f Merge "[MTE] Add device config to control upgrade time" am: 84a30c8526 am: 04378de425
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219633

Change-Id: I2801d2e7dd37835a2a35fedc554436ea017f7e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 18:43:32 +00:00
Florian Mayer
04378de425 Merge "[MTE] Add device config to control upgrade time" am: 84a30c8526
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219633

Change-Id: If398225ba6f3499a4f0a4facd7cc0e566f704f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 18:12:13 +00:00
Florian Mayer
4c3c526e54 [MTE] Reset MTE state for userdata wipe in fastbootd
Test: $ adb shell su root [...]/mtectrl memtag,memtag-kernel default
      $ adb shell 'su root dd bs=1 skip=32832 if=/dev/block/bootdevice/by-name/misc count=15 | xxd'
      00000000: 015a fefe 5a05 [...]
      $ adb reboot fastboot
      $ fastboot -w
      $ fastboot reboot
      $ adb shell 'su root dd bs=1 skip=32832 if=/dev/block/bootdevice/by-name/misc count=15 | xxd'
      00000000: 0000 0000 0000 [...]

Bug: 245596152
Change-Id: I5e2d4584776ab1685bdf37124e32dcb827eaf05a
2022-10-03 11:01:36 -07:00
Florian Mayer
84a30c8526 Merge "[MTE] Add device config to control upgrade time" 2022-10-03 17:47:12 +00:00
Treehugger Robot
e6732f33d9 Merge "simg_dump.py: fix error for CHUNK_TYPE_FILL" am: f2065c8890 am: 9b5afb80dc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2238988

Change-Id: I651311a64ebd6c7898021818e2c206ac354cc0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 17:02:15 +00:00
Florian Mayer
7a6079000c [MTE] add device config for permissive mode
Change-Id: Ifb16c0f29f07870f59ab50522d010689ee232de8
2022-10-03 09:58:39 -07:00
Treehugger Robot
9b5afb80dc Merge "simg_dump.py: fix error for CHUNK_TYPE_FILL" am: f2065c8890
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2238988

Change-Id: Ib533f310d008ed1014ef3699816463503ac52ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 16:32:40 +00:00
Treehugger Robot
f2065c8890 Merge "simg_dump.py: fix error for CHUNK_TYPE_FILL" 2022-10-03 15:51:33 +00:00
Bowgo Tsai
dbf62d939a simg_dump.py: fix error for CHUNK_TYPE_FILL
In python3, division of two integers produces a float,
which cannot be used to multiply a bytes sequence.

Using // to produce an integer quotient.

Bug: 245257511
Test: ./system/core/libsparse/simg_dump.py -sv path/to/image
Change-Id: Ibe95056409ac3676a68f5e7693331ca4a66e9fb7
2022-10-03 16:27:49 +08:00
Peter Collingbourne
cf976b85b4 Merge "Resync zygote64 and zygote64_32 rc files." am: 9f7a19d0f3 am: df1a5bf61f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2239035

Change-Id: If63ef21d2341da5ae830329234e5edb99109aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 19:59:27 +00:00
Peter Collingbourne
df1a5bf61f Merge "Resync zygote64 and zygote64_32 rc files." am: 9f7a19d0f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2239035

Change-Id: I4d0a67c24048105bff89b0c6187914798d7cef1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 19:29:31 +00:00
Peter Collingbourne
9f7a19d0f3 Merge "Resync zygote64 and zygote64_32 rc files." 2022-09-30 18:56:35 +00:00
Krzysztof Kosiński
f0c98d4c60 Merge "storaged: Fix deprecated usages of protobuf API." am: 27bccbfdef am: 147d5e1a6a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2231186

Change-Id: I48e4cbbb835054a1eaa266587442839b985a9723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 01:29:31 +00:00
Krzysztof Kosiński
147d5e1a6a Merge "storaged: Fix deprecated usages of protobuf API." am: 27bccbfdef
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2231186

Change-Id: Ib60d7deb27a0a2b7a34ada73e98117cd1acb5d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 00:59:45 +00:00
Krzysztof Kosiński
27bccbfdef Merge "storaged: Fix deprecated usages of protobuf API." 2022-09-30 00:31:19 +00:00
Peter Collingbourne
d77b91b4ba Resync zygote64 and zygote64_32 rc files.
I noticed that the zygote64 and zygote64_32 files
had gotten slightly out of sync as a result of change
I3aad4b4b1d2f54db9e7ba86db8a655d8552bad0a. Merge the zygote64_32 changes
into zygote64, and to prevent this from happening again, replace the
64-bit zygote declaration in zygote64_32 with an import from zygote64.

Change-Id: I7fcceeb22b722c2164b9acf0b517a32ce34731fd
2022-09-29 17:21:54 -07:00
Jiyong Park
c1c34a7081 Merge "Annotate symbols correctly" am: b2d8315f10 am: 1ded786966
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229031

Change-Id: I825112a10aa24140987eae46788d6e7dc153b634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 02:57:41 +00:00
Jiyong Park
1ded786966 Merge "Annotate symbols correctly" am: b2d8315f10
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229031

Change-Id: I757613c400b27519c5c8453f46138c2065dcf257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:59:46 +00:00
Jiyong Park
b2d8315f10 Merge "Annotate symbols correctly" 2022-09-28 01:22:45 +00:00
Akilesh Kailash
d028616ea7 Merge "snapuserd: Set taskprofile OtaProfiles" am: 33081c0f90 am: 2349099be4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2233549

Change-Id: I1c8f1bc3373f2f35b0fbdd3efefad97a4dec0b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 20:33:40 +00:00
Akilesh Kailash
2349099be4 Merge "snapuserd: Set taskprofile OtaProfiles" am: 33081c0f90
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2233549

Change-Id: Iebf89f9f5d104e78d9da85b89f0dfcc654b6e6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 20:01:49 +00:00
Akilesh Kailash
33081c0f90 Merge "snapuserd: Set taskprofile OtaProfiles" 2022-09-27 19:36:59 +00:00
Akilesh Kailash
2e780402e2 snapuserd: Set taskprofile OtaProfiles
Since update-engine already has this profile set,
it is better to have similar profile for the daemon
so that threads don't run at high priority.

Additionally, lower the nice value for worker
threads.

No change in the OTA install time observed.

Bug: 237490659
Test: Full OTA on Pixel
Change-Id: I53ec8c647eb781965792683b04621e6fec5eb5f2
Signed-off-by: Akilesh Kailash <akailash@google.com>
2022-09-27 19:36:49 +00:00
Pete Bentley
560adf7a16 Merge "Add AID for PRNG seeder daemon." am: 751cdc9489 am: 1c801c2168
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229337

Change-Id: I3a0ebf3946f94f7a56960a2f702c37e3310c8715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 22:03:16 +00:00
Pete Bentley
1c801c2168 Merge "Add AID for PRNG seeder daemon." am: 751cdc9489
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229337

Change-Id: I23417a043792d6a0cd3fc0d04cd7f83f4daabecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 21:45:31 +00:00
Pete Bentley
751cdc9489 Merge "Add AID for PRNG seeder daemon." 2022-09-26 21:27:42 +00:00
Eric Biggers
d76e4e01c9 bootstat: remove unused FDE boot events
Android 13 dropped support for Full Disk Encryption (FDE) entirely, as
it has been replaced by File Based Encryption (FBE).  Therefore, the
FDE-specific boot events are never emitted.  Remove them from the code:

   * boot_decryption_complete
   * boot_complete_post_decrypt
   * factory_reset_boot_complete_post_decrypt
   * ota_boot_complete_post_decrypt
   * post_decrypt_time_elapsed

Bug: 208476087
Change-Id: Id7a3bbd4f273693bd37b0cd27542dc6080d1c4f4
2022-09-26 19:50:09 +00:00
Pete Bentley
6cb61610e6 Add AID for PRNG seeder daemon.
Also adjust permissions on /dev/hw_random to allow prng_seeder group
read access.

Manual testing protocol:
* Verify prng_seeder daemon is running and has the
  correct label and uid/gid.
* Verify prng_seeder socket present and has correct
  label and permissions
* Verify no SELinux denials
* strace a libcrypto process and verify it reads seeding
  data from prng_seeder (e.g. strace bssl rand -hex 1024)
* strace seeder daemon to observe incoming connections
  (e.g. strace -f -p `pgrep prng_seeder`)
* Kill daemon, observe that init restarts it
* strace again and observe clients now seed from new instance

Bug: 243933553
Test: Manual - see above
Change-Id: I4d526844b232fc2a1fa5ffd701ca5bc5c09e7e96
2022-09-26 17:50:09 +01:00
Jiyong Park
eb7ec7b9e8 Annotate symbols correctly
Currently, tagging a symbol with #apex (# systemapi or # llndk) is not
required when the symbol is in a non-NDK library. However, this is
considered dangerous because such a symbol will automatically be
promoted to NDK APIs when the library is promoted to an NDK library.
When that happens, the native API council won't be able to notice the
promotion because promoting a non-NDK library into an NDK library
doesn't require an update of the map.txt file, but Android.bp only.

To prevent that, we should mandate those tags for Mainline APIs
regardless of whether the library the API belongs to is an NDK library
or not.

Upcoming changes in build/soong will enforce this. This change is to
prepare for the enforcement.

Note that this is a build-time only change. There's no behavior change
at runtime.

Bug: 184712170
Test: m
Change-Id: I769c5318e0cfd092f2f2b368f1a860065c79818f
2022-09-26 22:14:43 +09:00
Yi-Yo Chiang
0cba7afd67 remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all
* remount don't check errno after calling fs_mgr_overlayfs_mount_all()
  as we don't report error status through errno anymore.
* fs_mgr_overlayfs_mount_all() returns false if any failure.
* fs_mgr_overlayfs_mount_all() returns true if no overlayfs to mount or
  all overlayfs are either already mounted or mounted successfully.

Bug: 241179247
Bug: 248295731
Test: Treehugger
Change-Id: Ia9c7ac686f6538a9f5da7efc4cda6f28aff056f6
2022-09-26 16:37:27 +08:00
Zhanglong Xia
a59e8f142b Merge "init.rc: create /data/misc/threadnetwork folder" am: 8945a42a1e am: 1576063f49
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2226357

Change-Id: Ib2413e4b167822569578f8112b04a2f425c57e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 05:41:24 +00:00
Zhanglong Xia
1576063f49 Merge "init.rc: create /data/misc/threadnetwork folder" am: 8945a42a1e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2226357

Change-Id: I87c195c42f773692c9112692212e76eda001b9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 05:07:33 +00:00
Zhanglong Xia
8945a42a1e Merge "init.rc: create /data/misc/threadnetwork folder" 2022-09-26 04:20:54 +00:00
Krzysztof Kosiński
832b63e677 storaged: Fix deprecated usages of protobuf API.
Bug: 203713560
Test: presubmit
Change-Id: I49e78c7eb65a5a99c2e8c79633704d7e60db1e60
2022-09-25 08:18:20 +00:00