Commit graph

67798 commits

Author SHA1 Message Date
Treehugger Robot
54be11cf54 Merge "Let init mount/unmount debugfs for non-user builds" am: 8376d87e2d am: 2bd8b0a33a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1542228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c78fb1c001db0cba52db0135b449c73b56dc5ee
2021-01-13 05:32:50 +00:00
Treehugger Robot
2bd8b0a33a Merge "Let init mount/unmount debugfs for non-user builds" am: 8376d87e2d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1542228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifecc7cea5c810715184c2a432a1e843e40605b6e
2021-01-13 05:12:49 +00:00
Treehugger Robot
8376d87e2d Merge "Let init mount/unmount debugfs for non-user builds" 2021-01-13 04:24:22 +00:00
SzuWei Lin
977b7d21bc Merge "Deprecate /factory" am: bedae3910c am: 232c427b52
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1547514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1355101b19f7bedabba3ff58d93ac20273e6666
2021-01-13 01:59:57 +00:00
SzuWei Lin
232c427b52 Merge "Deprecate /factory" am: bedae3910c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1547514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I724b201df6296d8b7fdc3b179ec62e27b40f9f04
2021-01-13 01:36:13 +00:00
SzuWei Lin
bedae3910c Merge "Deprecate /factory" 2021-01-13 01:11:43 +00:00
Hridya Valsaraju
fb921a1c4e Let init mount/unmount debugfs for non-user builds
This change will help non-user builds with keeping debugfs
disabled during run time. Instead, debugfs will be mounted by init
to enable boot time initializations to set up vendor debug data
collection and unmounted after boot. It will be also be mounted by
dumpstate for bug report generation and unmounted after.

This change is only intended to help vendors (who depend on debugfs to
collect debug information from userdebug/eng builds) keep debugfs
disabled during runtime. Platform code must not depend on debugfs at all.

Test: manual
Bug: 176936478
Change-Id: I2e89d5b9540e3de094976563682d4b8c5c125876
2021-01-12 14:41:53 -08:00
David Anderson
efe26e5380 Merge changes from topic "snapuserd-selinux" am: 270c98f190 am: 956696c7d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546849

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ecbf88e6ecaf4ef62cc2c171519fbf461c4ab4a
2021-01-12 22:08:49 +00:00
David Anderson
956696c7d8 Merge changes from topic "snapuserd-selinux" am: 270c98f190
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546849

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide64e6295407931f13368d903faf5a70a1fbda1f
2021-01-12 21:03:40 +00:00
David Anderson
270c98f190 Merge changes from topic "snapuserd-selinux"
* changes:
  libsnapshot: Fix tests that depend on PrepareOneSnapshot().
  libsnapshot: Ensure dm-user devices are destroyed after a merge.
  libsnapshot: Fix tests for mapping snapshots in first-stage init.
  init: Add an selinux transition for snapuserd.
2021-01-12 19:01:01 +00:00
Akilesh Kailash
d4e3b43a47 Merge "libsnapshot:snapuserd: Handle un-aligned IO request" am: 06ee6f1753 am: 305e576481
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1545308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibebf68f2df5bd45015b2a7f780c752e41ed7be64
2021-01-12 08:10:25 +00:00
David Anderson
8302b875a0 libsnapshot: Fix tests that depend on PrepareOneSnapshot().
PrepareOneSnapshot was hardcoded in a way that only worked with
pre-compression devices. This patch makes it use the public API and
supported update flow.

One test, SnapshotTest.Merge, now uses OpenSnapshotWriter instead of
MapUpdateSnapshot. There are still other tests using the old API call.

Bug: N/A
Test: vts_libsnapshot_test
Change-Id: Iec4bf6efe6a82e1f90b81fa4211201845ebabe62
2021-01-11 23:37:32 -08:00
Akilesh Kailash
305e576481 Merge "libsnapshot:snapuserd: Handle un-aligned IO request" am: 06ee6f1753
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1545308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bcc515172aab7f35ca8ee486bfc91b981291117
2021-01-12 07:07:52 +00:00
Akilesh Kailash
06ee6f1753 Merge "libsnapshot:snapuserd: Handle un-aligned IO request" 2021-01-12 06:51:47 +00:00
David Anderson
4067c7e1a7 libsnapshot: Ensure dm-user devices are destroyed after a merge.
Also, make sure snapuserd has closed its references. This is preventing
the merge from completing until a reboot.

Bug: N/A
Test: vts_libsnapshot_test
Change-Id: Iba18f887bdb262c630ec44461871e19fe64dbf3c
2021-01-11 22:42:11 -08:00
David Anderson
2147cc5675 libsnapshot: Fix tests for mapping snapshots in first-stage init.
These tests are failing due to a missing WaitForFile call. Simplify
setting this up by adding a helper.

Bug: N/A
Test: vts_libsnapshot_test
Change-Id: Ic2afa74f72c7e364695233120b2327bae904882a
2021-01-11 22:42:09 -08:00
SzuWei Lin
478868826f Deprecate /factory
After Treblized, AOSP do not handle /factory folder. Also, AOSP
does not mount any partition to /factory. /factory has no possibility
to have any content. For factory purpose, it can be implemented in
vendor.

Bug: 177280838
Test: na
Change-Id: I0a2537336c2ef1efbad3e4f9e876aeaa607bc737
2021-01-12 12:18:39 +08:00
Akilesh Kailash
d2ad50103e libsnapshot:snapuserd: Handle un-aligned IO request
If the requested IO is not 4k aligned and spans
between two COW Operations, then we will have
to split the IO as we need to read the partial
buffers from two COW operations.

BUG: 176918488
Test: cow_snapuserd_test - Data verification with unaligned IO
      Full OTA on cuttlefish
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Icf6801e1767112b92cb7991808860f119adebda2
2021-01-12 01:09:21 +00:00
Peter Collingbourne
dc3a0973b4 Merge "Remove ANDROID_EXPERIMENTAL_MTE." am: 942e5eef44 am: 945704b449
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1542047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59174735f4cdc8d0d61be85f278a0cbd1378b1c5
2021-01-11 21:37:41 +00:00
Matthew Maurer
76f874d4d3 Merge changes I595cb4ee,Ie8623a70 am: b026acb71e am: a4c021f228
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1544688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2927b702b2bdf48daaff32651a519cc3e47f1df
2021-01-11 21:37:18 +00:00
Peter Collingbourne
945704b449 Merge "Remove ANDROID_EXPERIMENTAL_MTE." am: 942e5eef44
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1542047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386040a28b2ccc0d5f07f3ac3caec6676069f989
2021-01-11 21:07:33 +00:00
Matthew Maurer
a4c021f228 Merge changes I595cb4ee,Ie8623a70 am: b026acb71e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1544688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib853b7c5a9e7d589fd2234313a796602b14b8d72
2021-01-11 21:05:59 +00:00
Peter Collingbourne
942e5eef44 Merge "Remove ANDROID_EXPERIMENTAL_MTE." 2021-01-11 20:42:44 +00:00
Matthew Maurer
b026acb71e Merge changes I595cb4ee,Ie8623a70
* changes:
  trusty: tipc-test: Use dma_buf rather than memfd
  trusty: tipc-test: Test multi-page support
2021-01-11 20:12:22 +00:00
Peter Collingbourne
cd27807bfe Remove ANDROID_EXPERIMENTAL_MTE.
Now that the feature guarded by this flag has landed in Linux 5.10
we no longer need the flag, so we can remove it.

Bug: 135772972
Change-Id: I02fa50848cbd0486c23c8a229bb8f1ab5dd5a56f
2021-01-11 10:55:51 -08:00
Matthew Maurer
8ca6ab0161 trusty: tipc-test: Use dma_buf rather than memfd
Test: tipc-test -t send-fd
Bug: 117221195
Change-Id: I595cb4ee5fc24d8cafc9a3e706346139a974d674
2021-01-11 10:23:46 -08:00
Matthew Maurer
b6e795513b trusty: tipc-test: Test multi-page support
Test: tipc-test -t send-fd
Bug: 117221195
Change-Id: Ie8623a70f6935ede6bb5e9dd1a7945a7e356d854
2021-01-11 10:23:30 -08:00
David Anderson
491e4da372 init: Add an selinux transition for snapuserd.
With compressed VAB updates, it is not possible to mount /system without
first running snapuserd, which is the userspace component to the dm-user
kernel module. This poses a problem because as soon as selinux
enforcement is enabled, snapuserd (running in a kernel context) does not
have access to read and decompress the underlying system partition.

To account for this, we split SelinuxInitialize into multiple steps:

First, sepolicy is read into an in-memory string.

Second, the device-mapper tables for all snapshots are rebuilt. This
flushes any pending reads and creates new dm-user devices. The original
kernel-privileged snapuserd is then killed.

Third, sepolicy is loaded from the in-memory string.

Fourth, we re-launch snapuserd and connect it to the newly created
dm-user devices. As part of this step we restorecon device-mapper
devices and /dev/block/by-name/super, since the new snapuserd is in a
limited context.

Finally, we set enforcing mode.

This sequence ensures that snapuserd has appropriate privileges with a
minimal number of permissive audits.

Bug: 173476209
Test: full OTA with VABC applies and boots
Change-Id: Ie4e0f5166b01c31a6f337afc26fc58b96217604e
2021-01-08 16:39:51 -08:00
Gavin Corkery
b7fdb2dfd1 Merge "Add /metadata/watchdog" am: 09494764ae am: 1d6fd9a190
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c17e708215773225db389dba84ef625b4439138
2021-01-08 10:12:13 +00:00
Gavin Corkery
1d6fd9a190 Merge "Add /metadata/watchdog" am: 09494764ae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I519c466fcc6e5277092c3fec43d455978b8b850d
2021-01-08 09:29:26 +00:00
Gavin Corkery
09494764ae Merge "Add /metadata/watchdog" 2021-01-08 08:20:45 +00:00
Gavin Corkery
badf3962bc Add /metadata/watchdog
This directory will be used to store the mitigation count
from Package Watchdog in the case of a boot loop, in
order to persist the value across fs-checkpointing
rollbacks. One integer will be stored in a file in this
directory, which will be read and then deleted at the
next boot. No userdata is stored.

See go/rescue-party-reboot for more context.

Test: Manual test using debug.crash_sysui property
      and inspecting file
Bug: 171951174
Change-Id: I2bd5e1ebe14d7e9e4f0e0dbeb90cf76b8400752e
2021-01-07 19:41:07 +00:00
Nicolas Geoffray
69fab4410c Merge "Add boot animation progress system property." am: 5266e041ef am: 6d2e6e246c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39e27f457e40ca98b79250a3a51626147b2ea68
2021-01-07 10:02:53 +00:00
Nicolas Geoffray
6d2e6e246c Merge "Add boot animation progress system property." am: 5266e041ef
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d8e2907a466aa3e241b0756dcc1ba7427d741f
2021-01-07 09:40:46 +00:00
Nicolas Geoffray
5266e041ef Merge "Add boot animation progress system property." 2021-01-07 09:23:35 +00:00
Shawn Willden
698a443116 Merge "Revert^2 "Revise KeymasterMessage versioning system"" am: e3e5ae9eae am: 94ab937da8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1541058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2851ae9d9c4d9f2a3acfde220a1f53e13ae627f1
2021-01-06 23:32:38 +00:00
Shawn Willden
94ab937da8 Merge "Revert^2 "Revise KeymasterMessage versioning system"" am: e3e5ae9eae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1541058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf0bc7dfa8c31fd203f05b142640220f4a269115
2021-01-06 23:18:02 +00:00
Shawn Willden
e3e5ae9eae Merge "Revert^2 "Revise KeymasterMessage versioning system"" 2021-01-06 22:58:32 +00:00
Jaegeuk Kim
42211910e8 Merge "Pass wiped and fs_type to vold to format encrypted partition" am: 7ef01c913f am: 73e781bb04
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20b56c3f674df569c866ee62dd6e27dc9a7bb06b
2021-01-06 20:00:50 +00:00
Shawn Willden
9323f4113b Revert^2 "Revise KeymasterMessage versioning system"
24d46bd512

Change-Id: I4edcfdada8321ff181db70002a2661b821f6b33f
Bug: 176867651
Merged-In: Idefcdd64afa7977f6dc2c4299e69cc5065dcc20d
2021-01-06 19:54:24 +00:00
Jaegeuk Kim
73e781bb04 Merge "Pass wiped and fs_type to vold to format encrypted partition" am: 7ef01c913f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1530481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cbc187c695039a36fad74de4fd5fdf318b87aff
2021-01-06 19:43:27 +00:00
Jaegeuk Kim
7ef01c913f Merge "Pass wiped and fs_type to vold to format encrypted partition" 2021-01-06 19:12:34 +00:00
Treehugger Robot
5b7d85256b Merge "Revert "Revise KeymasterMessage versioning system"" am: f24141175a am: 1acab60bb6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1540851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fd7e836741c6c55cb79a7742277813a561af934
2021-01-06 10:07:39 +00:00
Treehugger Robot
1acab60bb6 Merge "Revert "Revise KeymasterMessage versioning system"" am: f24141175a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1540851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4548e6a27fd5260ba9c5c8b016562700141c0b8
2021-01-06 09:45:47 +00:00
Treehugger Robot
f24141175a Merge "Revert "Revise KeymasterMessage versioning system"" 2021-01-06 09:24:43 +00:00
Bonian Chen
24d46bd512 Revert "Revise KeymasterMessage versioning system"
Revert "Revise KeymasterMessage versioning system"

Revert "Revise KeymasterMessage versioning system"

Revert "Add new message versioning protocol"

Revert submission 1533821-new_km_versioning

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=7064747&lkbb=7064769&fkbb=7064769, bug 176867651
Reverted Changes:
I040fe7f62:Revise KeymasterMessage versioning system
Ibea104c39:Revise KeymasterMessage versioning system
Ibea104c39:Revise KeymasterMessage versioning system
I425fb45fc:Add new message versioning protocol

Change-Id: I1569334c59cb62be6aae4a42ce999f40c7a472de
BUG: 176867651
2021-01-06 06:42:21 +00:00
Treehugger Robot
27545f9b68 Merge "Adding Car GSI public key" am: 208cad671d am: 2f76ec20bf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a85640abfe9f8868995d0db06672f00798281c5
2021-01-06 05:03:41 +00:00
Treehugger Robot
6afd5b6795 Merge "Add assemble_cvd to com.android.virt" am: bd11a5c73a am: 3df7577a2b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1539924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b635b875393d2ae8ac318b0b8bcb103309dfc92
2021-01-06 05:03:35 +00:00
Treehugger Robot
9c43ef821b Merge "Revert "libprocessgroup: move freezer to uid/pid hierarchy"" am: bde5350eed am: 6fe271403c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1539808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83a5d77393de531d7cbc5c22a8a2fef6283a826e
2021-01-06 05:03:29 +00:00
Treehugger Robot
305a518e0c Merge "Revise KeymasterMessage versioning system" am: 936557b6f0 am: b749531c35
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1534104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f51ec4d756a0fadc6bf17c321147807e455de8e
2021-01-06 04:59:58 +00:00