Commit Graph

68730 Commits

Author SHA1 Message Date
Elliott Hughes 1fc404900c Merge "Remove move dead code." am: acec0918e5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1677028

Change-Id: I87daacd3eb5f510aa2beb461e277fd5984d8978f
2021-04-16 17:05:33 +00:00
Elliott Hughes acec0918e5 Merge "Remove move dead code." 2021-04-16 16:38:28 +00:00
Paul Crowley e16255c8bc Merge changes from topic "revert-1665499-revert-1660531-max-boot-level-crypto-KFMCEDKSIV-WPIHELCRFI" am: 61abbef4e4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670267

Change-Id: I74a6e6739dff743cc88ff6e8609871b712b6322c
2021-04-16 16:13:13 +00:00
Paul Crowley fe8e0de9a9 Revert^2 "Expose AID_KEYSTORE" am: 37a413d1c3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670266

Change-Id: I556b3a5e1ff238be74bbf3ca98cfa628e5bc7bb3
2021-04-16 16:13:05 +00:00
Paul Crowley 61abbef4e4 Merge changes from topic "revert-1665499-revert-1660531-max-boot-level-crypto-KFMCEDKSIV-WPIHELCRFI"
* changes:
  Revert^2 "Set earlyBootEnded before apex starts"
  Revert^2 "Expose AID_KEYSTORE"
2021-04-16 15:51:27 +00:00
Treehugger Robot ff2460d0a2 Merge "Move debugfs mount/unmount to init-debug.rc" am: 3f4ea91c7c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1674965

Change-Id: I996f49e66d420f12b63e11eca3ecde6df4daea5a
2021-04-16 02:24:24 +00:00
Treehugger Robot a072b8ae21 Merge "Install platform-bootclasspath generated config in /system/etc." am: f1cb594c05
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673485

Change-Id: I43cc5dc32c56e85bbbfc2b7cd5988a8ecb3888c7
2021-04-16 02:24:04 +00:00
Treehugger Robot 3f4ea91c7c Merge "Move debugfs mount/unmount to init-debug.rc" 2021-04-16 01:54:54 +00:00
Treehugger Robot f1cb594c05 Merge "Install platform-bootclasspath generated config in /system/etc." 2021-04-16 01:51:33 +00:00
Artur Satayev a2631ebc13 Install platform-bootclasspath generated config in /system/etc.
platform-bootclasspath module generates classpaths.proto config with
the information for derive_classpath to read and parse at runtime.

See go/updatable-bootclasspath.

Bug: 180105615
Test: m && launch_cvd; presubmit / DeviceBootTest
Change-Id: I0f4b1cfce9468fd6e3377a1d7233245e30f1ea51
2021-04-15 22:32:31 +00:00
Elliott Hughes 4b7b4d6d7b Remove move dead code.
Test: treehugger
Change-Id: I6a23b19d078400dfe90329a49ae1abbcb24ef2bf
2021-04-15 15:18:54 -07:00
Paul Crowley 7583da1bcd Revert^2 "Set earlyBootEnded before apex starts"
Revert submission revert-1660531-max-boot-level-crypto-KFMCEDKSIV

Reason for revert: topic:vold-use-keystore2 has landed fixing the bug

Reverted changes:
Ibf63734a: Revert "Set earlyBootEnded before apex starts"
Id02f63a7: Revert "Expose AID_KEYSTORE"
Ibcedeff4: Revert "Cryptographic security for MAX_BOOT_LEVEL"

Restored changes:
Ia3b968afc:Set earlyBootEnded before apex starts
Ia69891291:Expose AID_KEYSTORE
I12530cd13:Cryptographic security for MAX_BOOT_LEVEL

Reverted-SHA1: 82cfe66794

Original commit message:
earlyBootEnded signals to keystore2 to read the database for the first
time, and start the MAX_BOOT_LEVEL system. It must therefore run
after /data is mounted and /data/misc/keystore is created, but before
apexd or odsign starts.

Bug: 176450483
Test: atest com.android.tests.odsign.OnDeviceSigningHostTest#verifyArtUpgradeSignsFiles
Change-Id: Ib9c2b4bbdddecdf73924125f9bdc75c82e1dd257
2021-04-15 12:55:28 -07:00
Treehugger Robot f7c4f3b94b Merge "Do not populate `ro.kernel.` properties in init" am: 5e89a35ae3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676728

Change-Id: I8c24e5c7b9f4c49eff0731387b3e62c4a49313dd
2021-04-15 18:58:23 +00:00
Treehugger Robot 5e89a35ae3 Merge "Do not populate `ro.kernel.` properties in init" 2021-04-15 18:19:45 +00:00
Tri Vo ceab40a08a Merge "Trusty: Move tipc fuzzer connection to end of iteration" am: afe3212a19
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675366

Change-Id: I1b99ebb2b7a727962ecb8d57f268dffa77e6791f
2021-04-15 17:08:50 +00:00
Tri Vo afe3212a19 Merge "Trusty: Move tipc fuzzer connection to end of iteration" 2021-04-15 16:41:30 +00:00
Orion Hodson f34e438232 Merge "Create directory for caching odrefresh metrics" am: abe3b42eb4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671827

Change-Id: Ib3576c14c7df193be13358327754cab1dbee9dbf
2021-04-15 10:09:30 +00:00
Jooyung Han df2d1c1827 Merge "Make prebuilt_etc for public.libraries.android.txt" am: 0bfa7c92f1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675435

Change-Id: Ibbca1b3e47d62bea9b17568e6f73cc6359928a91
2021-04-15 10:08:32 +00:00
Orion Hodson abe3b42eb4 Merge "Create directory for caching odrefresh metrics" 2021-04-15 08:51:01 +00:00
Jooyung Han 0bfa7c92f1 Merge "Make prebuilt_etc for public.libraries.android.txt" 2021-04-15 08:49:25 +00:00
Roman Kiryanov f4adb894cc Do not populate `ro.kernel.` properties in init
`ro.kernel.` is deprecated, emulator migrated to
`ro.boot.`.

Bug: 182291166
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I074f9a63dc4e3edcc01930b2e8481efd1d85eb55
2021-04-14 20:45:55 -07:00
Daniel Rosenberg 5487958d34 Merge changes Ie93d09b3,I56f0218f,I3c9a3855 am: 4872b73b9e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673893

Change-Id: If7d1c987e289fd3c23e4604f785cdbda673c6a5c
2021-04-15 02:43:59 +00:00
Daniel Rosenberg 4872b73b9e Merge changes Ie93d09b3,I56f0218f,I3c9a3855
* changes:
  libsnapshot: Check cluster size on appends
  libsnapshot: Zero out leftover ops in CowWriter
  libsnapshot: Fix premature truncation in CowWriter.
2021-04-15 01:49:13 +00:00
Stephen Crane e54e8d4ebf Trusty: Move tipc fuzzer connection to end of iteration
We detect a TA crash by not being able to reconnect to its channel. We
were previously connecting to the TA at the beginning of each fuzz
iteration, but this results in only detecting a crash on the following
iteration. By moving this connection to the end of the fuzz iteration,
we can detect a crash corresponding to the correct fuzz iteration and
libFuzzer will produce the correct crashing input.

Test: /data/fuzz/arm64/trusty_keymaster_fuzzer/trusty_keymaster_fuzzer
Bug: 185407818
Change-Id: I6808c72611fcabab5b314218f8b588dd7d944188
2021-04-15 01:02:50 +00:00
Jooyung Han 489cea14d8 Make prebuilt_etc for public.libraries.android.txt
so that this can be packaged in a filesystem(e.g microdroid)

Bug: 181093750
Test: MicrodroidTestCase
Change-Id: Ib86789de4632a32eee31fee0607d5ade8ae6b33f
2021-04-15 09:45:48 +09:00
Elliott Hughes ca3794ea68 Merge "Remove String8::toUpper()." am: 450f66bd8f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673886

Change-Id: I981fd2a3da5f4a918b9bfae7cf0df626e7ca68a4
2021-04-14 18:26:39 +00:00
Elliott Hughes 450f66bd8f Merge "Remove String8::toUpper()." 2021-04-14 17:36:36 +00:00
Bill Yi c4683fb99d [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 664f9cd068 -s ours
am skip reason: skip tag Change-Id I1093e922d7251b9a30bc5b450f1ed924892f5cac with SHA-1 0b14b02240 is already in history

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

Change-Id: Id23ee7681f0c4abb15a1c1c43050e792a12ae113
2021-04-14 05:46:17 +00:00
Bill Yi 664f9cd068 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:51 +00:00
Bill Yi 19ee982d26 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: I1093e922d7251b9a30bc5b450f1ed924892f5cac
Merged-In: I54b465b57f0c6b2cbc5f2aa4fb03756cbbc507a0
Change-Id: I9f00c4b6250f4a7d3d9998781c20787c26ae0feb
2021-04-13 19:29:22 -07:00
Bill Yi d7bdf7f312 Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-04-14 00:27:06 +00:00
David Anderson 0b14b02240 Merge "Unable to mount filesystem in fastbootd mode on the user build." am: 7723c72cab
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1653935

Change-Id: I1093e922d7251b9a30bc5b450f1ed924892f5cac
2021-04-14 00:09:39 +00:00
David Anderson 7723c72cab Merge "Unable to mount filesystem in fastbootd mode on the user build." 2021-04-13 23:45:01 +00:00
Hridya Valsaraju 3f384a25fa Move debugfs mount/unmount to init-debug.rc
Debugfs cannot be mounted in userbuilds since Android R. Since init only
mounts/unmounts debugfs during boot for debug builds, move it to
init-debug.rc.

Bug: 184381659
Test: build/boot
Change-Id: Ib51e82b99ec1eb95a2647c91855f6d4d1585040a
2021-04-13 14:45:50 -07:00
Steven Moreland 7e2a6bf3b0 Merge "libutils: group deprecated RefBase functions" am: 4efe03b492
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673555

Change-Id: Iea9b224125f1a6876a8b60b41e42515752299dcf
2021-04-13 17:15:23 +00:00
Steven Moreland 4efe03b492 Merge "libutils: group deprecated RefBase functions" 2021-04-13 16:47:28 +00:00
Andrew Walbran e9ac67edb0 Merge "Give virtmanager user access to /dev/kvm and /dev/vhost-vsock for crosvm" am: d8d9736573
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673407

Change-Id: I0b6bc44ebbc1184ea0b47f6a5d96aa78e1470b63
2021-04-13 12:02:12 +00:00
Andrew Walbran d8d9736573 Merge "Give virtmanager user access to /dev/kvm and /dev/vhost-vsock for crosvm" 2021-04-13 09:18:44 +00:00
Yo Chiang 6e944a9484 Merge "Load *_compat_cil_file from system_ext as well" am: 3841fdfa3c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1650271

Change-Id: I7e01eddc0ca726328ed6c0b310c93e237b7cf39e
2021-04-13 06:33:38 +00:00
Yo Chiang 3841fdfa3c Merge "Load *_compat_cil_file from system_ext as well" 2021-04-13 05:48:04 +00:00
Daniel Rosenberg 35ff136a25 libsnapshot: Check cluster size on appends
When appending, if the cluster should end after the given label, ensure
that it does.

Bug: 183985866
Test: cow_api_test#ResumeEndCluster
Change-Id: Ie93d09b3431755d0b9b92761619d55df7f9f6151
2021-04-12 21:52:06 -07:00
Daniel Rosenberg 861e69a4c2 libsnapshot: Zero out leftover ops in CowWriter
When opening in append mode, we could write less than what was present
before. This could result in data blocks referencing beyond the end of
the file, or partially written ops. Zeroing these out will prevent
invalid leftovers from potentially causing confusion.

Bug: 183985866
Test: cow_api_test
Change-Id: I56f0218f3ea5b83c0614d1b86e81a4ca885f5c5e
2021-04-12 21:52:06 -07:00
David Anderson db25e8e32d libsnapshot: Fix premature truncation in CowWriter.
When opening in append mode, we ftruncate() the COW. This has three side
effects:
 (1) If the COW is never modified, or Finalized(), the state of the COW
     will have changed. Ideally it should only change on an explicit
     write operation.
 (2) Data after the current cluster will be accidentally thrown away.
 (3) The ending "cluster" op will be thrown away if the current cluster
     was incomplete, and thus the last valid label could be invalidated.

Bug: 183985866
Test: cow_api_test
Change-Id: I3c9a38553b7492a3d6e71d177d75ddb1b6490dfe
2021-04-12 21:52:06 -07:00
Steven Moreland 8c8d361981 libutils: group deprecated RefBase functions
Make it easier to see reference to usage documentation, as requested in
review.

Bug: 184190315
Test: libutils_test
Change-Id: If9056e35b1c7a779dd78f2b986ad10d02f25eaf3
2021-04-12 23:56:07 +00:00
David Anderson 20be1caa69 Merge "fastboot: Add a few missing fastboot commands from help" am: 9a95ed928f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673408

Change-Id: I9a97187c9efede6190b003e452e7fb69d60bfd0a
2021-04-12 21:50:22 +00:00
David Anderson 547a61c8f4 Merge "libsnapshot: Add diagnostics for DM_DEV_REMOVE failures." am: 055f802086
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1668591

Change-Id: Ic8ec83946be5a8f4efb89e79ff8d7295f2551cc1
2021-04-12 21:49:41 +00:00
David Anderson 9a95ed928f Merge "fastboot: Add a few missing fastboot commands from help" 2021-04-12 21:17:42 +00:00
David Anderson 055f802086 Merge "libsnapshot: Add diagnostics for DM_DEV_REMOVE failures." 2021-04-12 21:04:08 +00:00
Elliott Hughes 9434f59c17 Remove String8::toUpper().
Actually, it looks like it's only toLower() that's used, so let's remove
toUpper() separately, since it's so easy.

Test: treehugger
Change-Id: I8fae9fa513b2a34d5bd6b3f64e9305a1ee3c1ec4
2021-04-12 13:38:31 -07:00
Elliott Hughes 7e7ff3635d Merge "Remove the weird range variants of String8::toLower() and String8::toUpper()." am: 561209ee66
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670567

Change-Id: I98d18a90303d2e2b40d24f475bce5f867f712325
2021-04-12 19:28:33 +00:00