OSDN Git Service
Eric Biggers [Mon, 7 Oct 2019 19:27:11 +0000 (12:27 -0700)]
vold: use new ioctls to add/remove fscrypt keys when supported
am:
f3dc4203dd
Change-Id: I31edb0db46b471233e716b5d277460bb99693d78
Tao Bao [Fri, 4 Oct 2019 00:16:41 +0000 (17:16 -0700)]
Merge "Mark libvold_headers as recovery_available."
am:
4a13731f08
Change-Id: I52df6333c5c6ce47d9c2cbc3e80d50dc4939c9d1
Treehugger Robot [Fri, 4 Oct 2019 00:01:53 +0000 (00:01 +0000)]
Merge "Mark libvold_headers as recovery_available."
Tao Bao [Wed, 2 Oct 2019 06:31:17 +0000 (23:31 -0700)]
Mark libvold_headers as recovery_available.
recovery modules use <cryptfs.h> (in particular CRYPT_FOOTER_OFFSET).
Test: mmma bootable/recovery
Change-Id: I97b038476ccbeb0a5ac4a6cde86063325bdbb152
Eric Biggers [Mon, 30 Sep 2019 20:05:58 +0000 (13:05 -0700)]
vold: use new ioctls to add/remove fscrypt keys when supported
When the kernel supports the new fscrypt key management ioctls, use them
instead of add_key() and keyctl_unlink().
This will be needed in order to support v2 encryption policies, since v2
encryption policies only support the new ioctls.
The new ioctls have other advantages too. For example,
FS_IOC_REMOVE_ENCRYPTION_KEY automatically evicts exactly the necessary
kernel objects, so the drop_caches sysctl is no longer needed. This
makes evicting keys faster and more reliable.
FS_IOC_REMOVE_ENCRYPTION_KEY also detects if any files are still open
and therefore couldn't be "locked", whereas this went undetected before.
Therefore, to start out this patch adds support for using the new ioctls
for v1 encryption policies, i.e. on existing devices.
(Originally based on a patch by Satya Tangirala <satyat@google.com>)
Bug:
140500828
Test: tested that a device using v1 policies continues to work, both
with and without an updated kernel. See
If64028d8580584b2c33c614cabd5d6b93657f608 for more details.
Also checked via the log that the filesystem-level keyring is in
fact used when supported.
Change-Id: I296ef78138578a3fd773797ac0cd46af1296b959
Daniel Rosenberg [Thu, 26 Sep 2019 21:54:42 +0000 (14:54 -0700)]
Merge "Add drosen to OWNERS"
am:
c0b0795dd6
Change-Id: Ice2ac2518cb8f384f8ce8a2a12a5a50febe53e15
Daniel Rosenberg [Thu, 26 Sep 2019 21:30:15 +0000 (21:30 +0000)]
Merge "Add drosen to OWNERS"
Daniel Rosenberg [Fri, 20 Sep 2019 23:42:32 +0000 (16:42 -0700)]
Add drosen to OWNERS
Test: build/make/tools/checkowners.py -c -v system/vold/OWNERS
Change-Id: Ic774577a0368f8cdbeb043f8021aec7457198276
Paul Crowley [Tue, 17 Sep 2019 06:01:13 +0000 (23:01 -0700)]
Merge "Create a per-boot key on each boot"
am:
dab5ddf663
Change-Id: Iee4dabdcccedcbf652ae23edb4d20404947a765c
Paul Crowley [Tue, 17 Sep 2019 05:40:05 +0000 (05:40 +0000)]
Merge "Create a per-boot key on each boot"
Eric Biggers [Mon, 16 Sep 2019 21:20:47 +0000 (14:20 -0700)]
Merge "vold: use system-clang-format"
am:
7e65d8dd00
Change-Id: Ib0e898e67aa0032d53e52676a93b56b0640e11cf
Eric Biggers [Mon, 16 Sep 2019 21:03:26 +0000 (21:03 +0000)]
Merge "vold: use system-clang-format"
Eric Biggers [Mon, 16 Sep 2019 18:45:17 +0000 (11:45 -0700)]
vold: use system-clang-format
Link .clang-format to the standard .clang-format file (4-space-indent
version) from build/soong, rather than use a custom file.
Among other changes, the standard file has the "IncludeBlocks: Preserve"
setting, so include blocks stay in order.
Don't actually reformat all the code yet.
Test: Tried 'clang-format -i $(find . -name \*.cpp -o -name \*.h)'
and checked that the changes look sane.
Change-Id: I11ecbd03b31e44ba7b3e01175a6fc317f8173ab0
Paul Crowley [Mon, 16 Sep 2019 17:42:06 +0000 (10:42 -0700)]
Merge "Add ebiggers to OWNERS"
am:
88dba9a558
Change-Id: I70868eab667ea5566164ec4d8a5d19e230a89736
Paul Crowley [Mon, 16 Sep 2019 17:23:02 +0000 (17:23 +0000)]
Merge "Add ebiggers to OWNERS"
Paul Crowley [Wed, 11 Sep 2019 22:00:08 +0000 (15:00 -0700)]
Create a per-boot key on each boot
Bug:
140882488
Test: Booted twice, checked logs to ensure encryption
is different each time, adb created files in directory.
Change-Id: I74077bf8f727dab726c25f512ed7406a74cbe0bf
Paul Crowley [Fri, 13 Sep 2019 22:06:32 +0000 (15:06 -0700)]
Add ebiggers to OWNERS
Test: n/a
Change-Id: I08ece80400dae0c0d25c2fcef7168bbed9034745
Shawn Willden [Thu, 12 Sep 2019 16:29:15 +0000 (09:29 -0700)]
Merge "Request rollback resistance for FBE keys."
am:
aae52f4816
Change-Id: Ie2143da9b9b1d2e76faa958d1a04d2be6b0045e7
Treehugger Robot [Thu, 12 Sep 2019 15:20:45 +0000 (15:20 +0000)]
Merge "Request rollback resistance for FBE keys."
Xin Li [Sun, 8 Sep 2019 20:07:03 +0000 (13:07 -0700)]
Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
Bug:
135460123
Change-Id: I1605f33ede34c8289a6eede94b62c8695df81b63
Merged-In: I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e
Steven Moreland [Fri, 6 Sep 2019 21:32:26 +0000 (14:32 -0700)]
Merge "Remove libhwbinder/libhidltransport deps"
am:
88a19b6fe1
Change-Id: I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e
Treehugger Robot [Fri, 6 Sep 2019 20:12:41 +0000 (20:12 +0000)]
Merge "Remove libhwbinder/libhidltransport deps"
Steven Moreland [Thu, 5 Sep 2019 21:18:22 +0000 (14:18 -0700)]
Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.
Bug:
135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I890b572d537d66ecb49effd8efc782279c52956e
Xin Li [Thu, 5 Sep 2019 16:53:32 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"
Xin Li [Wed, 4 Sep 2019 20:35:31 +0000 (13:35 -0700)]
DO NOT MERGE - Merge Android 10 into master
Bug:
139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258
Paul Lawrence [Tue, 27 Aug 2019 15:45:00 +0000 (08:45 -0700)]
Merge "Fix ext4/metadata/udc issue"
am:
ee867be1f1
Change-Id: I69b89b464a4d04b27e1da7d3990dcbec9525afe4
Paul Lawrence [Tue, 27 Aug 2019 15:21:58 +0000 (15:21 +0000)]
Merge "Fix ext4/metadata/udc issue"
Paul Lawrence [Tue, 27 Aug 2019 01:32:29 +0000 (18:32 -0700)]
Merge "Fix crash in mainline"
am:
3a0d51f6b7
Change-Id: I63925fd090707f56076a59349c237a83f4ec8234
Treehugger Robot [Tue, 27 Aug 2019 01:01:28 +0000 (01:01 +0000)]
Merge "Fix crash in mainline"
Paul Lawrence [Mon, 26 Aug 2019 22:09:41 +0000 (15:09 -0700)]
Fix crash in mainline
Current behavior:
Assume not checkpointing
cp_startCheckpoint creates the file in metadata
cp_needsCheckpoint will now set isCheckpointing to true
cp_commitCheckpoint will now think there is a checkpoint, and try to
commit it. This will fail on ext4 and it will return false, leading to
bad things.
cp_startCheckpoint is called when staging an apex module for update.
After this point, several things could go wrong:
If a keystore key is deleted, it calls cp_needsCheckpoint to see if the
delete should be deferred until cp_commitCheckpoint. The delete will now
be deferred, meaning that this key will never be deleted, using up the
key sots in trustzone
If a trim is scheduled through idle maintenance, this also calls
cp_needsCheckpoint, so the trims will not occur.
If either of these happens before a system crash, the device will not
recover since the system calls commitCheckpoint which will now crash.
When the system then goes on to reboot, the checkpoint will not be
triggered, since the commitCheckpoint call will have deleted the
checkpoint flag file before crashing.
Bug:
138952436
Test: vdc checkpoint startCheckpoint 5
vdc checkpoint needsCheckpoint
vdc checkpoint commitChanges
stop;start
commitChanges fails, then device loops
After applying this test, commitChanges succeeds and device does
not loop
Change-Id: I135099625f77344d1f8d2e8688735871c44ef2f5
Paul Lawrence [Fri, 23 Aug 2019 00:32:17 +0000 (17:32 -0700)]
Merge "Fix race condition is commitCheckpoint"
am:
1059810759
Change-Id: I3cb7931ee01d208cb6f5f435aa5fc40cacd78b65
Treehugger Robot [Fri, 23 Aug 2019 00:11:38 +0000 (00:11 +0000)]
Merge "Fix race condition is commitCheckpoint"
Paul Lawrence [Thu, 22 Aug 2019 16:51:18 +0000 (09:51 -0700)]
Fix race condition is commitCheckpoint
If cp_commitCheckpoint is called twice at the same time, the second call
to setBowState will fail.
Add lock to remove possibility, and protect all uses of isCheckpointing
Bug:
138952436
Test: Boots after flashing in checkpoint mode
Change-Id: I131298adc506c3c176774d15e642b13d5f991087
Paul Lawrence [Wed, 7 Aug 2019 22:22:57 +0000 (15:22 -0700)]
Fix ext4/metadata/udc issue
Test: Cannot test since no device supports this combo
Bug:
137924328
Change-Id: I451c90e0826ede71876f3e4f260e7083f3ab3fdb
Jaegeuk Kim [Mon, 12 Aug 2019 18:39:55 +0000 (11:39 -0700)]
secdiscard: should call fsync to avoid reordering IOs
am:
6c5e453f9e
Change-Id: I90de814c136171d4ff2ce913b801171e7f27c70e
Jaegeuk Kim [Thu, 8 Aug 2019 16:07:58 +0000 (09:07 -0700)]
secdiscard: should call fsync to avoid reordering IOs
Don't make stale zero'ing IO in block device after unlink, since filesystem
can reuse the block addresses and issue some IOs. If block layer reordered
two IOs, filesystem will see zero data, which crashes filesystem consistency.
Bug:
136964285
Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.CrossProfileAppsHostSideTest
Change-Id: I43c13622d094cecda1c53468adc240002111d605
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
David Anderson [Sat, 13 Jul 2019 00:20:37 +0000 (17:20 -0700)]
Merge "libdm now requires linking to libext2_uuid." am:
9e821da9fe am:
e91c2686e9
am:
d26cb98c4d
Change-Id: Ie6988c9cdf17a1f36a4f9aa59544ba5f461d825b
David Anderson [Fri, 12 Jul 2019 23:53:04 +0000 (16:53 -0700)]
Merge "libdm now requires linking to libext2_uuid." am:
9e821da9fe
am:
e91c2686e9
Change-Id: I585749bae8d30931a164b5f2a7900fea2fe1aa29
David Anderson [Fri, 12 Jul 2019 23:25:24 +0000 (16:25 -0700)]
Merge "libdm now requires linking to libext2_uuid."
am:
9e821da9fe
Change-Id: Id33c9fc83352535cb45f27e70dec6000c73b07a5
David Anderson [Fri, 12 Jul 2019 23:03:41 +0000 (23:03 +0000)]
Merge "libdm now requires linking to libext2_uuid."
Xin Li [Wed, 10 Jul 2019 00:24:55 +0000 (17:24 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
711f4faac3 -s ours am:
e7487087d0 -s ours
am:
49304ac627
Change-Id: I0ef4e364f9afe14cec3a1c9a6d389709bf2e59ce
Xin Li [Tue, 9 Jul 2019 23:52:34 +0000 (16:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
33080d8b49 -s ours am:
2c1e06e589 -s ours
am:
4c373e4563
Change-Id: If915398214afac55d629175c502dbaaa1a875f3c
Xin Li [Tue, 9 Jul 2019 23:27:56 +0000 (16:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
711f4faac3 -s ours
am:
e7487087d0 -s ours
am skip reason: subject contains skip directive
Change-Id: I94ad8ca99f9a6b2aa522e8371794d43ae8840117
Xin Li [Tue, 9 Jul 2019 23:22:08 +0000 (16:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am:
711f4faac3 -s ours
am skip reason: subject contains skip directive
Change-Id: I334dfe94d70709434fd3c98c581a80cc4a7c00a4
Xin Li [Tue, 9 Jul 2019 23:00:55 +0000 (16:00 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
33080d8b49 -s ours
am:
2c1e06e589 -s ours
am skip reason: subject contains skip directive
Change-Id: If8cd430d5b10fbc50fc0cde9314644ec34b2309b
Xin Li [Tue, 9 Jul 2019 22:18:16 +0000 (15:18 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am:
33080d8b49 -s ours
am skip reason: subject contains skip directive
Change-Id: Id76bbc6615fa330e65f857c365e96c446855a242
Xin Li [Tue, 9 Jul 2019 21:38:47 +0000 (21:38 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
Xin Li [Tue, 9 Jul 2019 18:24:40 +0000 (11:24 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug:
136196576
Change-Id: I2fc2c9bb2631e627ebe74b6f081819c1eb0f3fcd
android-build-team Robot [Mon, 8 Jul 2019 23:36:54 +0000 (23:36 +0000)]
Snap for
5622519 from
59295fbb94e3a75c3341419aadbc66c560296179 to pi-platform-release
Change-Id: I402d144258df8eefe4c87766616ba32221bfbb67
Xin Li [Tue, 2 Jul 2019 20:47:31 +0000 (13:47 -0700)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
am:
aaea4b51ed
Change-Id: Id23cf76973224c771883eb1abb38191fc52d679b
Xin Li [Mon, 1 Jul 2019 21:00:30 +0000 (21:00 +0000)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
Bug:
134405016
Change-Id: I19ac2279aa2cb1c5ad444d25484aa1ec0d7efac6
Paul Lawrence [Fri, 28 Jun 2019 22:07:54 +0000 (15:07 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am:
dde9704664
am:
7d43cb0ae9 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I2b29a01279fcd03f35a17156d5eafc42ce510980
Paul Lawrence [Fri, 28 Jun 2019 00:06:54 +0000 (17:06 -0700)]
[automerger skipped] Merge "Add property to prevent commit for Vts test" am:
5bcfb5bf45 am:
3507d68556 -s ours
am:
d5fe5cfcb5 -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1
3f1ce062d5 is in history
Change-Id: Iab7f9bf4e3d7968384b2a35ae398e60e84bf0664
Paul Lawrence [Thu, 27 Jun 2019 23:46:06 +0000 (16:46 -0700)]
[automerger skipped] Merge "Add property to prevent commit for Vts test" am:
5bcfb5bf45
am:
3507d68556 -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1
3f1ce062d5 is in history
Change-Id: I2a5fe3fc7bbf3af55facde1ab07bd0559d8e7d87
Paul Lawrence [Thu, 27 Jun 2019 23:38:26 +0000 (16:38 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am:
dde9704664 -s ours
am:
13539f79f5 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I0ed87e8107d4007c42545397d2cb03628527671a
Paul Lawrence [Thu, 27 Jun 2019 23:26:57 +0000 (16:26 -0700)]
Merge "Add property to prevent commit for Vts test"
am:
5bcfb5bf45
Change-Id: Ic6b0e863fb9c6ddea2cb19390a9520c3c87cf704
Paul Lawrence [Thu, 27 Jun 2019 23:25:58 +0000 (16:25 -0700)]
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am:
dde9704664 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1
236e5e800e is in history
Change-Id: I11c77206000895c27aee9ad8326778ec95e233df
Paul Lawrence [Thu, 27 Jun 2019 23:25:15 +0000 (16:25 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am:
dde9704664
Change-Id: I091c8d095b29dc966da86c2d4c93281615043355
Treehugger Robot [Thu, 27 Jun 2019 22:39:57 +0000 (22:39 +0000)]
Merge "Add property to prevent commit for Vts test"
TreeHugger Robot [Thu, 27 Jun 2019 22:36:27 +0000 (22:36 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
David Anderson [Thu, 27 Jun 2019 20:40:09 +0000 (13:40 -0700)]
libdm now requires linking to libext2_uuid.
Bug:
135771280
Test: mm vold -j
Change-Id: Id71c71926841581d4d3bc4a66f4c06294df21028
Paul Lawrence [Thu, 27 Jun 2019 18:13:01 +0000 (11:13 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" am:
2c792e0720 am:
5f19ef31c8
am:
4ad86a9315
Change-Id: I84b4618240530e4368a6275b84a456da9b518057
Paul Lawrence [Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" am:
2c792e0720
am:
5f19ef31c8
Change-Id: I7da7077c70484cb5873b9316058bc73158c19ab6
Paul Lawrence [Thu, 27 Jun 2019 17:50:06 +0000 (10:50 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption"
am:
2c792e0720
Change-Id: I1aed54ccf98fb73b29ed13fa971bbfbb25a489ae
Paul Lawrence [Tue, 25 Jun 2019 21:44:33 +0000 (14:44 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
When both ext4 user data checkpoints and metadata encryption are
enabled, we are creating two stacked dm devices. This had not been
properly thought through or debugged.
Test: Enable metadata encryption on taimen (add
keydirectory=/metadata/vold/metadata_encryption to flags for userdata in
fstab.hardware)
Unfortunately metadata is not wiped by fastboot -w, so it is
necessary to rm metadata/vold -rf whenever you wipe data.
fastboot flashall -w works
fastboot reboot -w works
A normal boot works
Disable checkpoint commits with
setprop persist.vold.dont_commit_checkpoint 1
vdc checkpoint startCheckpoint 10
adb reboot
wait for device to fully boot then
adb reboot
Wait for device to fully boot then
adb logcat -d | grep Checkpoint shows the rollback in the logs
This tests encryption on top of checkpoints with commit, encryption
without checkpoints, and rollback, which seems to be the key cases.
Also ran same tests on unmodified Taimen and Blueline
Bug:
135905679
Merged-In: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Change-Id: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Treehugger Robot [Thu, 27 Jun 2019 17:29:03 +0000 (17:29 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption"
Tri Vo [Thu, 27 Jun 2019 16:12:35 +0000 (09:12 -0700)]
Merge "vold: use RAII wake locks" am:
b585363d93 am:
99fd2a4b5a
am:
a4a04f5717
Change-Id: Ifc5e42eaebc4e07688180e008612c5b2de3d7caf
Tri Vo [Thu, 27 Jun 2019 02:43:21 +0000 (19:43 -0700)]
Merge "vold: use RAII wake locks" am:
b585363d93
am:
99fd2a4b5a
Change-Id: I8e37d315ecb6bad994d2a9c748cfc835756e265e
Tri Vo [Thu, 27 Jun 2019 02:30:09 +0000 (19:30 -0700)]
Merge "vold: use RAII wake locks"
am:
b585363d93
Change-Id: I21be9e28c19901c9ca3aa91eb2f7394d1f788ff2
Tri Vo [Thu, 27 Jun 2019 01:59:08 +0000 (01:59 +0000)]
Merge "vold: use RAII wake locks"
Android Build Merger (Role) [Wed, 26 Jun 2019 22:23:00 +0000 (22:23 +0000)]
Merge "[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b am:
cd5df6e1ef -s ours am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history" into qt-r1-dev-plus-aosp
Xin Li [Wed, 26 Jun 2019 22:22:32 +0000 (15:22 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b
am:
cd5df6e1ef -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: I8c1479273fc202237237f57a3ed2e79401083dd5
Xin Li [Wed, 26 Jun 2019 22:22:31 +0000 (15:22 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am:
3601f4790b -s ours
am:
0092301976 -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: Ife2798dfa4052da6c8fe8512f5899efd3a11cfe8
Paul Lawrence [Tue, 25 Jun 2019 21:44:33 +0000 (14:44 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
When both ext4 user data checkpoints and metadata encryption are
enabled, we are creating two stacked dm devices. This had not been
properly thought through or debugged.
Test: Enable metadata encryption on taimen (add
keydirectory=/metadata/vold/metadata_encryption to flags for userdata in
fstab.hardware)
Unfortunately metadata is not wiped by fastboot -w, so it is
necessary to rm metadata/vold -rf whenever you wipe data.
fastboot flashall -w works
fastboot reboot -w works
A normal boot works
Disable checkpoint commits with
setprop persist.vold.dont_commit_checkpoint 1
vdc checkpoint startCheckpoint 10
adb reboot
wait for device to fully boot then
adb reboot
Wait for device to fully boot then
adb logcat -d | grep Checkpoint shows the rollback in the logs
This tests encryption on top of checkpoints with commit, encryption
without checkpoints, and rollback, which seems to be the key cases.
Bug:
135905679
Change-Id: I8365a40298b752af4bb10d00d9ff58ce04beab1f
Xin Li [Wed, 26 Jun 2019 22:09:02 +0000 (15:09 -0700)]
[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes).
am:
3601f4790b -s ours
am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1
3d3a9a7f1c is in history
Change-Id: Ib97568c9eaecb3c52e4703f7d14a8235b9cc0cc4
Xin Li [Wed, 26 Jun 2019 22:08:51 +0000 (15:08 -0700)]
Restore historical behavior with fsck_msdos (always accept fixes).
am:
3601f4790b
Change-Id: I0c362a06814657e2ecf1059a942b7c21cf4e3051
Tri Vo [Fri, 21 Jun 2019 19:21:48 +0000 (12:21 -0700)]
vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/
133175847
Bug:
133175847
Test: boot blueline
Change-Id: Icda4c81e00a61adec6a12c61c329867fef284dc5
Xin Li [Thu, 6 Jun 2019 18:33:51 +0000 (11:33 -0700)]
Restore historical behavior with fsck_msdos (always accept fixes).
Bug:
133725065
Merged-In: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Change-Id: I1d50a7e52fda34e59eb6f051c7fde115a6cd5255
Ruslan Tkhakokhov [Fri, 21 Jun 2019 16:10:53 +0000 (09:10 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks"" am:
2ebb5c5b96 am:
fce081efa6
am:
0e2317857b
Change-Id: I1fa6054701877f2e6b81bd22292311234f47bc64
Ruslan Tkhakokhov [Fri, 21 Jun 2019 15:27:57 +0000 (08:27 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks"" am:
2ebb5c5b96
am:
fce081efa6
Change-Id: If58a55eecb04453f69e51cdc242f5ab71fb7ddc1
Ruslan Tkhakokhov [Fri, 21 Jun 2019 15:08:21 +0000 (08:08 -0700)]
Merge "Merged-In Revert "vold: use RAII wake locks""
am:
2ebb5c5b96
Change-Id: I6fe423a47de01eaf3d5bcc27fbfd7d96ea184156
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:34:43 +0000 (10:34 +0000)]
Merge "Merged-In Revert "vold: use RAII wake locks""
Ruslan Tkhakokhov [Fri, 21 Jun 2019 10:31:11 +0000 (10:31 +0000)]
Merged-In Revert "vold: use RAII wake locks"
This reverts commit
242130f3f8180baef35649f350ca737d0b0c6ae3.
Reason for revert: breaks the build
Change-Id: Ide809a114b2a04538f3ba4ed8af934bf326e54f3
David Anderson [Fri, 21 Jun 2019 01:28:20 +0000 (18:28 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am:
ee5eb39169 am:
5973b8cf00
am:
4d0dadb629
Change-Id: I63edc074953f99005f7e7b6fb53357fe7e9a085f
David Anderson [Fri, 21 Jun 2019 01:16:56 +0000 (18:16 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am:
ee5eb39169
am:
5973b8cf00
Change-Id: Ieb48b5b3ca4e5576d22b7db9bcc229b8fb2f47fb
David Anderson [Fri, 21 Jun 2019 01:06:16 +0000 (18:06 -0700)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
am:
ee5eb39169
Change-Id: Ib82969daab218360712f1b3bf2c2069c95932ee2
David Anderson [Thu, 20 Jun 2019 23:59:47 +0000 (23:59 +0000)]
Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously."
Tri Vo [Thu, 20 Jun 2019 23:35:52 +0000 (16:35 -0700)]
Merge "vold: use RAII wake locks" am:
798aa303da am:
56c6681ba8
am:
c3d9197784
Change-Id: I72c71a287162811acb24b9bc8be381b88b818488
Tri Vo [Thu, 20 Jun 2019 22:57:53 +0000 (15:57 -0700)]
Merge "vold: use RAII wake locks" am:
798aa303da
am:
56c6681ba8
Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631
Tri Vo [Thu, 20 Jun 2019 22:25:46 +0000 (15:25 -0700)]
Merge "vold: use RAII wake locks"
am:
798aa303da
Change-Id: I157e8ceb8ece246d00ce345bd110023977a6d208
Tri Vo [Thu, 20 Jun 2019 19:42:50 +0000 (19:42 +0000)]
Merge "vold: use RAII wake locks"
Tri Vo [Tue, 18 Jun 2019 22:33:01 +0000 (15:33 -0700)]
vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/
133175847
Bug:
133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7
David Anderson [Tue, 11 Jun 2019 21:51:25 +0000 (14:51 -0700)]
Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously.
Bug:
134711825
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
Paul Lawrence [Sat, 15 Jun 2019 00:33:30 +0000 (17:33 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported" am:
6c704f736c am:
7c35004b27
am:
1fc2d57bbd
Change-Id: I3ab32e4f3290e52f1ad27054a957b0632567f4bd
Paul Lawrence [Sat, 15 Jun 2019 00:20:04 +0000 (17:20 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported" am:
6c704f736c
am:
7c35004b27
Change-Id: Ie1906ef96432bed1058cc8ce6ecb6cd58adc769c
Paul Lawrence [Sat, 15 Jun 2019 00:11:00 +0000 (17:11 -0700)]
Merge "Fail startCheckpoint if checkpoints not supported"
am:
6c704f736c
Change-Id: I631c9828782452ab763d108d85082cd2120c5ee7
Treehugger Robot [Fri, 14 Jun 2019 23:30:49 +0000 (23:30 +0000)]
Merge "Fail startCheckpoint if checkpoints not supported"
Paul Lawrence [Wed, 12 Jun 2019 19:03:01 +0000 (12:03 -0700)]
Add property to prevent commit for Vts test
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug:
134126407
Test: Test passes with userdebug GSI on user Taimen
Merged-in: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Paul Lawrence [Thu, 13 Jun 2019 20:28:48 +0000 (13:28 -0700)]
Add property to prevent commit for Vts test am:
3f1ce062d5
am:
6eb8fa296e
Change-Id: I2027a793555fe4eceafc0ff03a05ff99d9ddf497
Paul Lawrence [Thu, 13 Jun 2019 20:21:05 +0000 (13:21 -0700)]
Add property to prevent commit for Vts test am:
3f1ce062d5
am:
1289741942
Change-Id: Ib0420dfa4a810e4a55a7370e146df67cef735fa9
OSDN Git Service
