Commit graph

4242 commits

Author SHA1 Message Date
Martijn Coenen
1129b81071 Add app's own UID to the default ACL.
On devices without sdcardfs, /Android/data/com.foo and
/Android/obb/com.foo can be written by other processes (eg installers);
in those cases, file ownership may be wrong. To ensure that the original
app always has access to the files contained in this directory, add a
group to the default ACL that matches the UID of the app. Since all apps
have their own UID also as their group ID, this ensures that things keep
working correctly.

Bug: 157530951
Test: atest
android.appsecurity.cts.ExternalStorageHostTest#testExternalStorageUnsharedObb
Change-Id: I829a2a7c7b578a8328643f38681e68796adcd6b2

Change-Id: Ibbc333fb395507363830dfcf5dc6f1cfd55f008d
2020-06-16 15:16:18 +02:00
Paul Lawrence
3fe931109c Don't call block checkpoint functions above dm-default-key
Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451
2020-06-12 09:13:42 -07:00
David Anderson
23850d30f6 Add an isCheckpointing() binder call for adb remount.
This is needed so "adb remount" can avoid writing to /data during a
checkpoint.

Bug: 157540389
Test: manual test
Change-Id: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1
2020-06-10 23:52:25 -07:00
Treehugger Robot
88595e5d16 [automerger skipped] Merge "Record use of metadata encryption in property" am: f20a16575f am: d49f8c9eb7 -s ours am: 3727ec993e -s ours am: 2af4815188 -s ours
am skip reason: Change-Id I400873ec207cb63f0407fefc83962bb3a927e294 with SHA-1 94abae03a9 is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1322598

Change-Id: Id047970b7ba30e9fc5977d538a89c96b00743234
2020-06-02 19:53:41 +00:00
Treehugger Robot
2af4815188 [automerger skipped] Merge "Record use of metadata encryption in property" am: f20a16575f am: d49f8c9eb7 -s ours am: 3727ec993e -s ours
am skip reason: Change-Id I400873ec207cb63f0407fefc83962bb3a927e294 with SHA-1 94abae03a9 is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1322598

Change-Id: I11151df4da7c1573cc7cb6fe63bb44480b80bf9c
2020-06-02 19:46:48 +00:00
Treehugger Robot
3727ec993e [automerger skipped] Merge "Record use of metadata encryption in property" am: f20a16575f am: d49f8c9eb7 -s ours
am skip reason: Change-Id I400873ec207cb63f0407fefc83962bb3a927e294 with SHA-1 94abae03a9 is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1322598

Change-Id: Idf38f57a2370789e069846b6dc3e4b36cb80d9e4
2020-06-02 19:33:43 +00:00
Treehugger Robot
d49f8c9eb7 Merge "Record use of metadata encryption in property" am: f20a16575f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1322598

Change-Id: I7b102707853ea2556c5a24858ae43ea5c2717616
2020-06-02 19:20:44 +00:00
Treehugger Robot
f20a16575f Merge "Record use of metadata encryption in property" 2020-06-02 19:04:12 +00:00
Paul Crowley
7fbd8d4474 Record use of metadata encryption in property
Bug: 152150018
Test: Cuttlefish with and without keydirectory option
Cherry-Picked-From: 94abae03a9
Merged-In: I400873ec207cb63f0407fefc83962bb3a927e294
Change-Id: I400873ec207cb63f0407fefc83962bb3a927e294
2020-06-02 11:16:55 -07:00
Automerger Merge Worker
271cf0ce5b Merge "Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: eaca298077" into rvc-d1-dev-plus-aosp am: f31dd99eae
Change-Id: I130ada02c9b71d324efc64c7f2341397512a3c98
2020-05-29 16:25:56 +00:00
Automerger Merge Worker
cc31f50e74 Merge "Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29 am: 59339e5c62" into rvc-qpr-dev-plus-aosp 2020-05-29 16:25:55 +00:00
Martijn Coenen
ea0018e8aa Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29 am: 59339e5c62
Change-Id: Iebd8d5cb5fdc55e6f82bd3d2525fd9cef8f62f49
2020-05-29 16:25:52 +00:00
Martijn Coenen
adbcadf5ac Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29 am: 27f2813d4b
Change-Id: I742fc293063a0883b0ae76d0d3ff497e1593732c
2020-05-29 16:25:43 +00:00
Automerger Merge Worker
f31dd99eae Merge "Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: eaca298077" into rvc-d1-dev-plus-aosp 2020-05-29 16:15:23 +00:00
Martijn Coenen
a2d954fca1 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: eaca298077
Change-Id: I9fbd99cfd49e720a805ddc8c5d293af941a36ed4
2020-05-29 16:15:19 +00:00
Martijn Coenen
27f2813d4b Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29
Change-Id: I1429d8e4b63f4c194c226e538f7595729317d4b1
2020-05-29 16:15:12 +00:00
Martijn Coenen
59339e5c62 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29
Change-Id: I91c1b387d8cf5967fa3ad412ca7453364668d812
2020-05-29 16:15:08 +00:00
Martijn Coenen
eaca298077 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a
Change-Id: I9f3435a686e76f9fbc8b8ec8cae33f5538a94ec5
2020-05-29 16:00:05 +00:00
Martijn Coenen
8714d59e29 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a
Change-Id: I587b49c9baed58fb87d27e060faf5d3d4ef8d788
2020-05-29 15:59:55 +00:00
Martijn Coenen
cbb69e548a Merge "vold: Support aborting FUSE connections." into rvc-dev 2020-05-29 15:47:05 +00:00
Abhijeet Kaur
0bd0a384cb FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b am: 74324b51de
Change-Id: I2f8377c8713bcae8c2b7e91b92c1ffe53ba5e74d
2020-05-29 15:35:15 +00:00
Abhijeet Kaur
65776fe8b3 FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c am: dfedc945ab
Change-Id: I6aa695accdeee88e4111d7f181bec71e749c94d1
2020-05-29 15:33:49 +00:00
Abhijeet Kaur
53f8a5cfe8 FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c am: 836430b5e0
Change-Id: I60691c32d8a7db33ab8d15d405b57eb1a7b9470d
2020-05-29 15:33:29 +00:00
Abhijeet Kaur
74324b51de FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b
Change-Id: I66bcb898dd960ced948d9137594539e8545c50c4
2020-05-29 15:19:08 +00:00
Abhijeet Kaur
dfedc945ab FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c
Change-Id: Ia7f5210da38ca4340f36957af894baf79a4dc41d
2020-05-29 15:19:00 +00:00
Abhijeet Kaur
836430b5e0 FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c
Change-Id: I1419edbe7c7004cee2cdb14bb5861d07e39d7b2f
2020-05-29 15:18:56 +00:00
Abhijeet Kaur
e2e2b5499b FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41
Change-Id: I1e26192d3ae181bc3fd9bcb3f7bf56db0f073328
2020-05-29 15:07:04 +00:00
Abhijeet Kaur
13bfc2465c FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41
Change-Id: Iebe048b3e1dd31a63ed62df8c2010e9e5d5d5e4a
2020-05-29 15:06:57 +00:00
Abhijeet Kaur
de83802e41 FuseDaemonHostTest is migrated to CTS and renamed.
FuseDaemonHostTest is migrated to CTS and renamed to
CtsScopedStorageHostTest.

Bug: 142926859
Test: atest --test-mapping
Change-Id: I24c74e20909ccf8868d1487e1cc93f6f2c0108fc
2020-05-28 18:43:08 +01:00
Martijn Coenen
23c0445355 vold: Support aborting FUSE connections.
This can be done through binder as well as vdc, using 'vdc volume
abort_fuse'.

Bug: 153411204
Test: adb shell vdc volume abort_fuse
Change-Id: I93e46dc1cd361729cc1162c63520cf73152ea409
2020-05-28 16:07:16 +02:00
Daniel Rosenberg
06adecf63c Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62 am: 82b2e7f6a0
Change-Id: I6630247dcf0b9077b0136d5e6022d58db170ed86
2020-05-21 09:17:41 +00:00
Daniel Rosenberg
825f679644 Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62 am: 49d964c1c9
Change-Id: Ic6bf52b4981efcafe9bdc8c1a907e0f6e793dd68
2020-05-21 09:03:03 +00:00
Daniel Rosenberg
b8a6d42431 Move enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc am: c8ee3a8cd6
Change-Id: Ie46376f6c0cdb42f8c68fb8877aeb52156e9175a
2020-05-21 09:02:05 +00:00
Daniel Rosenberg
82b2e7f6a0 Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62
Change-Id: Iaf328bd2731b680a0da9d66555c0ed7ea5b01b7a
2020-05-21 09:01:53 +00:00
Daniel Rosenberg
49d964c1c9 Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62
Change-Id: I6d11fa265c51423fa798c77652a6470ac0bdf88b
2020-05-21 09:01:49 +00:00
Daniel Rosenberg
c8ee3a8cd6 Move enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc
Change-Id: I7e37b4ffa8f629f809a25352a7a6c1ef4f789748
2020-05-21 08:46:56 +00:00
Daniel Rosenberg
09daf93c62 Move enabling sdcardfs behind a property am: f36bdddc7e
Change-Id: I6ded03167243e9fc60dc2206b5781a84a0140aa3
2020-05-21 08:41:18 +00:00
Daniel Rosenberg
4835e936fc Move enabling sdcardfs behind a property am: f36bdddc7e
Change-Id: I8bf90ef649975d182787757d73f9e2b46389483f
2020-05-21 08:41:14 +00:00
Treehugger Robot
84655ca145 [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours am: 16cbb5a2c8 -s ours am: 1399d250be -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: I85655d873a42f83f50a10d3639a73eca156d2f37
2020-05-20 08:14:20 +00:00
Treehugger Robot
1399d250be [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours am: 16cbb5a2c8 -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Iece0b98e72676046f3d16dd9fa2cb22235a3cc25
2020-05-20 07:45:30 +00:00
Treehugger Robot
16cbb5a2c8 [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Id73de89d4b905212935da4286ee50789b47695e6
2020-05-20 07:26:02 +00:00
Treehugger Robot
d625abfda2 Merge "Handle virtio in private fs mapping" am: e471d11d46
Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8
2020-05-20 07:08:04 +00:00
Treehugger Robot
e471d11d46 Merge "Handle virtio in private fs mapping" 2020-05-20 06:32:43 +00:00
Automerger Merge Worker
c8100b8edc Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp am: 6e535e3eb2
Change-Id: Iab50b51ce33b6ef8c3e1e902c411b85c849c4b29
2020-05-20 05:25:23 +00:00
Automerger Merge Worker
c644db4001 Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: f7c0f602d3" into rvc-qpr-dev-plus-aosp 2020-05-20 05:25:17 +00:00
TreeHugger Robot
d80d1602c1 Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: f7c0f602d3
Change-Id: I5c013704f2e5386632ad5575682f314c81c79dee
2020-05-20 05:24:54 +00:00
TreeHugger Robot
8563d538ef Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: 43f7db57f6
Change-Id: I9ef2acf09fe51567184ec9aee508c98170424d96
2020-05-20 05:24:30 +00:00
Daniel Rosenberg
f36bdddc7e Move enabling sdcardfs behind a property
This allows devices that have sdcardfs enabled in the kernel to not use
it. When external_storage.sdcardfs.enabled=0, sdcardfs will not be
mounted. This is treated as default true to not affect upgrading
devices. It does not use the old ro.sys.sdcardfs as that has been
repurposed over time and no longer can be relied on to turn off
sdcardfs. This is included within emulated_storage.mk

Bug: 155222498
Test: mount|grep "type sdcardfs" should find nothing after boot complete
      if external_storage.sdcardfs.enabled=0
Change-Id: I23d75fb1225aeabbcb1a035ad62fd042b6b3c7b5
2020-05-19 22:11:49 -07:00
Automerger Merge Worker
6e535e3eb2 Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp 2020-05-20 05:00:18 +00:00
TreeHugger Robot
f7c0f602d3 Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b
Change-Id: I42ca63f91246d722681fc56aaf2a5e125eaf26eb
2020-05-20 05:00:00 +00:00