Paul Lawrence
4b1dad6065
Merge "Fix ext4/metadata/udc issue" am: ee867be1f1
...
am: 3096e373be
Change-Id: I99ba00610a8f48f58bc8f51952bad49c6dc73fb1
5 years ago
Paul Lawrence
3096e373be
Merge "Fix ext4/metadata/udc issue"
...
am: ee867be1f1
Change-Id: I69b89b464a4d04b27e1da7d3990dcbec9525afe4
5 years ago
Paul Lawrence
ee867be1f1
Merge "Fix ext4/metadata/udc issue"
5 years ago
Paul Lawrence
5807c32725
Merge "Fix crash in mainline" am: 3a0d51f6b7
am: 6c5944f899
am: 9cd7fdc882
am: 06bd0c427f
...
am: 0f3c17b50f
Change-Id: I5425ca6ef3f65fbbec7b6d105054d9abf9d39c09
5 years ago
Paul Lawrence
0f3c17b50f
Merge "Fix crash in mainline" am: 3a0d51f6b7
am: 6c5944f899
am: 9cd7fdc882
...
am: 06bd0c427f
Change-Id: I689671afb25643d2e36e65e13374dd69051341b2
5 years ago
Paul Lawrence
06bd0c427f
Merge "Fix crash in mainline" am: 3a0d51f6b7
am: 6c5944f899
...
am: 9cd7fdc882
Change-Id: I13d6316005c1df1482f8426a25d672519873b4d1
5 years ago
Paul Lawrence
9cd7fdc882
Merge "Fix crash in mainline" am: 3a0d51f6b7
...
am: 6c5944f899
Change-Id: I2d40676c59d364c02154bced41e6ce818b5d4886
5 years ago
Paul Lawrence
6c5944f899
Merge "Fix crash in mainline"
...
am: 3a0d51f6b7
Change-Id: I63925fd090707f56076a59349c237a83f4ec8234
5 years ago
Treehugger Robot
3a0d51f6b7
Merge "Fix crash in mainline"
5 years ago
Paul Lawrence
9a6d1f73e5
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
5 years ago
Paul Lawrence
fc345f1c64
Merge "Fix race condition is commitCheckpoint" am: 1059810759
am: 556bd755e6
am: 86bc2a32d8
am: 466c1c07dd
...
am: 18aca481ff
Change-Id: I49d52fc1209a0c59d24ca35a81fff4fdfb8ed107
5 years ago
Paul Lawrence
18aca481ff
Merge "Fix race condition is commitCheckpoint" am: 1059810759
am: 556bd755e6
am: 86bc2a32d8
...
am: 466c1c07dd
Change-Id: Iedcdde19dc54a2a9ee5a1b104f1bcc9c46ca8af7
5 years ago
Paul Lawrence
466c1c07dd
Merge "Fix race condition is commitCheckpoint" am: 1059810759
am: 556bd755e6
...
am: 86bc2a32d8
Change-Id: Ie255d33f5f6efd049c0a3e8a619c1333069c0e8c
5 years ago
Paul Lawrence
86bc2a32d8
Merge "Fix race condition is commitCheckpoint" am: 1059810759
...
am: 556bd755e6
Change-Id: Ie80a3c123a5d30915cade7ddc1aad2d790476448
5 years ago
Paul Lawrence
556bd755e6
Merge "Fix race condition is commitCheckpoint"
...
am: 1059810759
Change-Id: I3cb7931ee01d208cb6f5f435aa5fc40cacd78b65
5 years ago
Treehugger Robot
1059810759
Merge "Fix race condition is commitCheckpoint"
5 years ago
Paul Lawrence
1d57f686a3
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
5 years ago
Paul Lawrence
4b140d397f
Fix ext4/metadata/udc issue
...
Test: Cannot test since no device supports this combo
Bug: 137924328
Change-Id: I451c90e0826ede71876f3e4f260e7083f3ab3fdb
5 years ago
android-build-team Robot
c4fd7be670
Snap for 5797917 from 6c5e453f9e
to qt-c2f2-release
...
Change-Id: I92e29452f176731c03fc482e5394cc5fad17c9c9
5 years ago
Jaegeuk Kim
679b05855a
secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e
am: 2af145ef20
...
am: 7ebe1a4bd8
Change-Id: I7475f738e3d46bb1cb24a75995dbc0e25231356b
5 years ago
Jaegeuk Kim
6a1fc39c5a
secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e
am: 732faaeb94
...
am: ceac8b8587
Change-Id: I0681b3aba14a0723f904c5e9246811e035949130
5 years ago
Jaegeuk Kim
7ebe1a4bd8
secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e
...
am: 2af145ef20
Change-Id: I6580f3e7b2adbb910295657e3c6ae67b8893da2a
5 years ago
Jaegeuk Kim
ceac8b8587
secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e
...
am: 732faaeb94
Change-Id: I8ae6f3b8e7950a9978741879d3b4ac344af61a60
5 years ago
Jaegeuk Kim
732faaeb94
secdiscard: should call fsync to avoid reordering IOs
...
am: 6c5e453f9e
Change-Id: I5710fcce302d040a29ff798df85bf71ef6e3fbb5
5 years ago
Jaegeuk Kim
2af145ef20
secdiscard: should call fsync to avoid reordering IOs
...
am: 6c5e453f9e
Change-Id: I90de814c136171d4ff2ce913b801171e7f27c70e
5 years ago
Jaegeuk Kim
6c5e453f9e
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>
5 years ago
David Anderson
7cd6ceb835
Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe
am: e91c2686e9
am: d26cb98c4d
...
am: 0be952d362
Change-Id: Icaa2f68ea5857df5dda76ebeb0ade0bbc9d26ccc
5 years ago
David Anderson
0be952d362
Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe
am: e91c2686e9
...
am: d26cb98c4d
Change-Id: Ie6988c9cdf17a1f36a4f9aa59544ba5f461d825b
5 years ago
David Anderson
d26cb98c4d
Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe
...
am: e91c2686e9
Change-Id: I585749bae8d30931a164b5f2a7900fea2fe1aa29
5 years ago
David Anderson
e91c2686e9
Merge "libdm now requires linking to libext2_uuid."
...
am: 9e821da9fe
Change-Id: Id33c9fc83352535cb45f27e70dec6000c73b07a5
5 years ago
David Anderson
9e821da9fe
Merge "libdm now requires linking to libext2_uuid."
5 years ago
Xin Li
33a52284b8
[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
...
am: ccf6d331b8
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ee8d1638313ea45cf2bb8e1cdc315127eeb1d15
5 years ago
Xin Li
ccf6d331b8
[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
5 years ago
Xin Li
70adcce6ac
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49
-s ours am: 2c1e06e589
-s ours am: 4c373e4563
...
am: 1c4860773a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib80d9941780b99f6bde1b0c5144bf7630ddb70db
5 years ago
Xin Li
1c4860773a
[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
5 years ago
Xin Li
49304ac627
[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
5 years ago
Xin Li
e7487087d0
[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
5 years ago
Xin Li
4c373e4563
[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
5 years ago
Xin Li
2c1e06e589
[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
5 years ago
Xin Li
711f4faac3
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
5 years ago
Xin Li
33080d8b49
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I2fc2c9bb2631e627ebe74b6f081819c1eb0f3fcd
5 years ago
android-build-team Robot
ec0cb71ca1
Snap for 5622519 from 59295fbb94
to pi-platform-release
...
Change-Id: I402d144258df8eefe4c87766616ba32221bfbb67
5 years ago
Xin Li
6660781ddb
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: aaea4b51ed
...
am: e39e69254e
-s ours
am skip reason: subject contains skip directive
Change-Id: I70cd10460af03a9c7ea89fed0edb422a24c99a3f
5 years ago
Xin Li
e39e69254e
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: aaea4b51ed
Change-Id: Id23cf76973224c771883eb1abb38191fc52d679b
5 years ago
Xin Li
aaea4b51ed
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I19ac2279aa2cb1c5ad444d25484aa1ec0d7efac6
5 years ago
Paul Lawrence
ca2f3aa268
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664
am: 7d43cb0ae9
-s ours
...
am: 39a0ecec18
-s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1 236e5e800e
is in history
Change-Id: I2596b55b73e6eb969fa9b8c596acf0329c36ac52
5 years ago
Paul Lawrence
39a0ecec18
[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
5 years ago
android-build-team Robot
dae28203f8
Snap for 5694913 from 7d43cb0ae9
to qt-c2f2-release
...
Change-Id: I1c3491d2e7453d6d909292bb706b1c6d0b6f898d
5 years ago
Paul Lawrence
b1b35cf5d8
[automerger skipped] Merge "Add property to prevent commit for Vts test" am: 5bcfb5bf45
am: 3507d68556
-s ours am: d5fe5cfcb5
-s ours
...
am: d233d202ba
-s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1 3f1ce062d5
is in history
Change-Id: I54fdd0db5490c80810aac4dca04b42d18b9b44ee
5 years ago
Paul Lawrence
d233d202ba
[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
5 years ago