Commit graph

6100 commits

Author SHA1 Message Date
Eric Biggers
8b09d9aba1 Merge "Move encrypted directories into place already-encrypted" am: ec6e52aadc am: 01ca68c4f8 am: 8e38d39179 am: 29b381b796 am: dd605339aa
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2620092

Change-Id: I398213056b551d8519ed166817ae0bc348c92488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 01:22:47 +00:00
Eric Biggers
dd605339aa Merge "Move encrypted directories into place already-encrypted" am: ec6e52aadc am: 01ca68c4f8 am: 8e38d39179 am: 29b381b796
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2620092

Change-Id: I0b2710999d858e989ee8d495feb1298b66db396e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 00:54:24 +00:00
Eric Biggers
29b381b796 Merge "Move encrypted directories into place already-encrypted" am: ec6e52aadc am: 01ca68c4f8 am: 8e38d39179
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2620092

Change-Id: Ice304428e084b2d4ce2ef2e1904b0fb2b57a5261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 00:08:32 +00:00
Eric Biggers
8e38d39179 Merge "Move encrypted directories into place already-encrypted" am: ec6e52aadc am: 01ca68c4f8
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2620092

Change-Id: Ib6627057ba9d1a11fc3ca2f7dbdc53254a4bf35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 23:21:11 +00:00
Eric Biggers
01ca68c4f8 Merge "Move encrypted directories into place already-encrypted" am: ec6e52aadc
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2620092

Change-Id: I0937a39d1b09ef4201b9c194543890685784fc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 22:40:35 +00:00
Eric Biggers
ec6e52aadc Merge "Move encrypted directories into place already-encrypted" 2023-06-13 22:11:39 +00:00
Eric Biggers
714b99d9da Remove write permission from file mode of top-level user dirs
https://r.android.com/2620458 is removing the write mode bit from the
top-level user directories on internal storage, in order to make the DAC
consistent with the SELinux policy.

This commit makes the corresponding change to adoptable storage.

Bug: 285239971
Test: sm set-virtual-disk true; sm partition disk:7,392 private
Change-Id: I17dfbe10909b34c2046a4d5b4ffd7764d5ae083b
2023-06-08 22:16:25 +00:00
Eric Biggers
c6f004a9c4 Move encrypted directories into place already-encrypted
Even after having changed the SELinux policy to remove system_server's
permission to create directories like /data/system_ce/10, there's still
a very small loophole where system_server can create a subdirectory
after vold creates the directory but before vold assigns an encryption
policy to it.  This isn't known to have actually happened (b/285239971
was a candidate, but it seems to have actually been caused by SELinux
being in permissive mode), but it's theoretically possible.

Close this loophole by making vold create encrypted directories under
temporary names and move them into place once they are fully prepared.

Bug: 156305599
Bug: 285239971
Test: Cuttlefish boots, and can be rebooted.
Change-Id: I53407c938bab02ab4b7e5bab8402f36eb47fb203
2023-06-08 22:08:09 +00:00
Treehugger Robot
2b7dc4e6d6 Merge "vold: move some libs from shared to static" am: 39f11368a5 am: f4ae30da97 am: f042721b4d am: 38f9593a28 am: 8ff1f1f7c9 am: efaa5b0e21
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: I119081a55530446195faf5b507dfed0aac809ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 20:39:44 +00:00
Treehugger Robot
efaa5b0e21 Merge "vold: move some libs from shared to static" am: 39f11368a5 am: f4ae30da97 am: f042721b4d am: 38f9593a28 am: 8ff1f1f7c9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: Ic47c0f4c2aa5729e371755ad4744e7b982421b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 19:57:02 +00:00
Treehugger Robot
8ff1f1f7c9 Merge "vold: move some libs from shared to static" am: 39f11368a5 am: f4ae30da97 am: f042721b4d am: 38f9593a28
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: I17327ff5fbdbdda7085bdf5f718da26e65e9d8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 19:00:10 +00:00
Treehugger Robot
38f9593a28 Merge "vold: move some libs from shared to static" am: 39f11368a5 am: f4ae30da97 am: f042721b4d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: Idcfda60f4e545c6b274e12ced27a628a0307f6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 18:16:34 +00:00
Treehugger Robot
f042721b4d Merge "vold: move some libs from shared to static" am: 39f11368a5 am: f4ae30da97
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: I926f4b96d2a4b6d57f606afec1384c779d82990a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:33:57 +00:00
Treehugger Robot
f4ae30da97 Merge "vold: move some libs from shared to static" am: 39f11368a5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: I237a3145216534a9c2e601e5c5606bbc87ea68eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:11:46 +00:00
Treehugger Robot
39f11368a5 Merge "vold: move some libs from shared to static" 2023-05-23 16:33:31 +00:00
Devin Moore
965d67ce6f vold: move some libs from shared to static
These libraries are only used by vold on a device and gain no
benifit from being included as shared libraries.

Moving them to static saves disk space, memory, and cpu cycles from the
dynamic linker.

Checking on cuttlefish accross 3 reboots:
This saves 613827 bytes of storage from the installed-files, 44KB of
private dirty memory, 172KB of PSS when only looking at the
libraries, and 155KB of PSS when looking at libraries and heap/stack
with shomap.

go/shared-to-static for more info on how this was determined.

Test: m
Bug: 280829178

Change-Id: I29af66dd66f4087ff1820ca661dc6dc2ace841fc
2023-05-23 00:37:02 +00:00
Pawan Wagh
473860edb4 Merge "Disable leak detection in vold fuzzer" am: a3e128a868 am: b7792484f1 am: c25a1e04f3 am: ef0d064fa2 am: 27865ac964 am: 73838d8ac7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2577820

Change-Id: I4036a597ca2a1e4181845479695e93214bb799f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 04:07:51 +00:00
Pawan Wagh
73838d8ac7 Merge "Disable leak detection in vold fuzzer" am: a3e128a868 am: b7792484f1 am: c25a1e04f3 am: ef0d064fa2 am: 27865ac964
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2577820

Change-Id: I3536286b46ecf8f545cafa70bb87af00ccb20776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 03:25:07 +00:00
Pawan Wagh
27865ac964 Merge "Disable leak detection in vold fuzzer" am: a3e128a868 am: b7792484f1 am: c25a1e04f3 am: ef0d064fa2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2577820

Change-Id: I07a9af0b9c56c7da6f57ce7208d41d14c1933567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 01:46:50 +00:00
Pawan Wagh
ef0d064fa2 Merge "Disable leak detection in vold fuzzer" am: a3e128a868 am: b7792484f1 am: c25a1e04f3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2577820

Change-Id: I5c289e5f81ca9addac64650ca5384c6502da251e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 00:16:39 +00:00
Pawan Wagh
c25a1e04f3 Merge "Disable leak detection in vold fuzzer" am: a3e128a868 am: b7792484f1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2577820

Change-Id: Ic5d49ddcf0345af10042ea606db625f905b6e001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 23:29:17 +00:00
Pawan Wagh
b7792484f1 Merge "Disable leak detection in vold fuzzer" am: a3e128a868
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2577820

Change-Id: I6d93f475f686d817fc847cced4e8164a921bf32c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 23:06:22 +00:00
Pawan Wagh
a3e128a868 Merge "Disable leak detection in vold fuzzer" 2023-05-08 22:53:03 +00:00
Pawan Wagh
e7b16911cb Disable leak detection in vold fuzzer
Bug: 278100447
Bug: 277650211
Test: m vold_native_service_fuzzer
Change-Id: I90ecbdadde5bfcdc967d8b5b750f0e551f30acb0
2023-05-05 23:57:13 +00:00
Treehugger Robot
1cacc3f86b Merge "[vold] Add mount lazy if forcemount fail." am: 823898eca3 am: 3741a1635b am: d6291a5c31 am: ee28350374 am: 3c50e43487
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1764385

Change-Id: I088d80faa9c1a79b3a2b500b744c6284db7117b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 13:33:24 +00:00
Treehugger Robot
3c50e43487 Merge "[vold] Add mount lazy if forcemount fail." am: 823898eca3 am: 3741a1635b am: d6291a5c31 am: ee28350374
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1764385

Change-Id: I04dea07d32680fd3204636a9682d700684b17eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 12:55:56 +00:00
Treehugger Robot
ee28350374 Merge "[vold] Add mount lazy if forcemount fail." am: 823898eca3 am: 3741a1635b am: d6291a5c31
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1764385

Change-Id: I89d25fe25eb4c8657fb51277407694e132a037fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 12:13:21 +00:00
Treehugger Robot
d6291a5c31 Merge "[vold] Add mount lazy if forcemount fail." am: 823898eca3 am: 3741a1635b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1764385

Change-Id: I771a33c85e35ce003e676bd60784b2a2ca0f2e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 11:47:49 +00:00
Treehugger Robot
3741a1635b Merge "[vold] Add mount lazy if forcemount fail." am: 823898eca3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1764385

Change-Id: If915976e128592cd93e0b7fdde4f9768f6155d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 11:09:13 +00:00
Treehugger Robot
823898eca3 Merge "[vold] Add mount lazy if forcemount fail." 2023-04-25 10:32:16 +00:00
Paul Lawrence
e1fbbf1ce8 Log reason for fuse-bpf being enabled/disabled am: 9adf86a881 am: b3fe9425e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22655192

Change-Id: If9e45edc2f427de341d6cf75c303e19e73405879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:53:02 +00:00
Paul Lawrence
0c3ddd2ae6 Log reason for fuse-bpf being enabled/disabled am: 9adf86a881 am: 5c7dafe91e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22655192

Change-Id: Ie0b13a3dd22e2bcebf5d862608e0e0472da99d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:47:44 +00:00
Paul Lawrence
b3fe9425e1 Log reason for fuse-bpf being enabled/disabled am: 9adf86a881
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22655192

Change-Id: I50c100d9d30d539630460bcf016937a9717e1d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:19:56 +00:00
Paul Lawrence
5c7dafe91e Log reason for fuse-bpf being enabled/disabled am: 9adf86a881
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22655192

Change-Id: I541c221082794964576fb457d6c804ad951deae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 17:19:12 +00:00
Paul Lawrence
9adf86a881 Log reason for fuse-bpf being enabled/disabled
Also don't try to set ro.fuse.bpf.is_running if it's already set.

Bug: 278263648
Ignore-AOSP-First: Feature is in internal
Test: Examine logs with various properties set
Change-Id: I9623a02c7065fa0d0c71c618d448bda0cd2a900e
2023-04-14 21:59:05 +00:00
Automerger Merge Worker
77bab0b4f9 Merge "Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev am: ee0a2bf52e am: 9bad75eb2d" 2023-04-12 15:39:41 +00:00
Paul Lawrence
8d3c7e0013 Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev am: ee0a2bf52e am: 1603b339e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22427697

Change-Id: Iaba4f9a890090744ba9d910821677fb069ce031f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 15:39:21 +00:00
Paul Lawrence
945e65d2b7 Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev am: ee0a2bf52e am: 9bad75eb2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22427697

Change-Id: Ie12df6c7b1468397cf0b2a76af5cf5657f530751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 15:39:19 +00:00
Paul Lawrence
9bad75eb2d Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev am: ee0a2bf52e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22427697

Change-Id: If2b2fcc55136560215d81791bd9ceb1bc5564631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 14:56:45 +00:00
Paul Lawrence
1603b339e8 Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev am: ee0a2bf52e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/22427697

Change-Id: Ie2adf92fe28a1d69017e5444eb1f0af3de4e730f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 14:56:41 +00:00
Paul Lawrence
ee0a2bf52e Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev 2023-04-12 14:31:27 +00:00
Steven Moreland
49a6f70d8b Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641 am: e9eee2b50e am: 15e9b2f3ad am: 82f9d33152
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: Ied14d1031a433c5a4cbd3eeeb34aec327b897153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 10:06:35 +00:00
Steven Moreland
82f9d33152 Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641 am: e9eee2b50e am: 15e9b2f3ad
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: I4d6bd5c3e98e348b5f43c97441b20625ab5cb68c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 09:44:55 +00:00
Steven Moreland
07e28d414b Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641 am: e9eee2b50e am: 15e9b2f3ad am: 094e8f0c94
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: Ieb40b6077700f0f9c26e04b76f5f26f68ad3d0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:04:37 +00:00
Steven Moreland
094e8f0c94 Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641 am: e9eee2b50e am: 15e9b2f3ad
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: Icb599a8a207fc1a47d8c88ac611ad70f697f589b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 06:51:51 +00:00
Steven Moreland
15e9b2f3ad Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641 am: e9eee2b50e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: Ib45eadd4459b4e07e28737658370e03c314f69fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 03:16:08 +00:00
Steven Moreland
e9eee2b50e Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: I323939dd2d50c62797603e2dc5c1848c61231bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 02:44:20 +00:00
Steven Moreland
0b6dd2c641 Merge "Explicit init .rc user." am: 6c8b6e1651
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2530203

Change-Id: I6a4938c8ea0918f8421d92e6d82d6b9d3c5dfeed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 02:12:34 +00:00
Steven Moreland
6c8b6e1651 Merge "Explicit init .rc user." 2023-04-11 21:33:30 +00:00
Steven Moreland
0eff1d2890 Explicit init .rc user.
Set the user explicitly.

Bug: 276813155
Test: boot
Change-Id: I54c14c47a3435d72e00280cf663f23ffbb9659ee
2023-04-10 20:54:26 +00:00