Commit graph

6331 commits

Author SHA1 Message Date
Ellen Arteca
d5c2e27d86 Merge "Replace string secret with a byte[] for CE storage in vold binder" into main am: a078ea365a am: 27ab1ed3ec
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3025836

Change-Id: I8c279fcc487108facf8d5244c0e367693a3116c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 03:46:02 +00:00
Ellen Arteca
27ab1ed3ec Merge "Replace string secret with a byte[] for CE storage in vold binder" into main am: a078ea365a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3025836

Change-Id: I3b07a07749b81cbf3eb0a294070b0bd27437c475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 03:25:20 +00:00
Ellen Arteca
a078ea365a Merge "Replace string secret with a byte[] for CE storage in vold binder" into main 2024-04-18 03:04:25 +00:00
Ellen Arteca
5177ed2e50 Replace string secret with a byte[] for CE storage in vold binder
Replace the current `string secret` argument to the lock/unlock of
CE storage with a `byte[]`. This is part of an effort to remove
instances of the LSKF and LSKF-derived secrets that are available
in a RAMdump -- since the strings are passed from Java, they cannot
be cleared, but `byte[]` can be.

This CL is the described argument change, and the propagation of this
change to the various functions that are called by the vold binder
functions.

Bug: 320392352
Test: Manual upgrade test:
	1. Flash the device with a build not including these changes
	2. Rebuild with these changes
	3. Flash the device (but do not wipe) with the build including
	   these changes
	4. See if the device boots and works normally -- if the CE
	   storage cannot be unlocked it will not start up and be usable
	   when the user logs in.
Change-Id: Icd4c925f2fd79e7533fdf9027e16f6736dbe1ab3
2024-04-17 18:41:54 +00:00
Treehugger Robot
006d00bede Merge "Fix some special usb can't mount issue." into main am: 77f8b00c3d am: a3b07ee49d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3046093

Change-Id: I33b586ef09adfde29bd0c2699ce7e7aed28c5781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 17:38:02 +00:00
Treehugger Robot
a3b07ee49d Merge "Fix some special usb can't mount issue." into main am: 77f8b00c3d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3046093

Change-Id: I2d60b5f786e4af218ac654b8ba9cdbcb720cbf5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 16:40:42 +00:00
Treehugger Robot
77f8b00c3d Merge "Fix some special usb can't mount issue." into main 2024-04-17 16:22:37 +00:00
Xiuqin Wang
22fa53488a Fix some special usb can't mount issue.
[Description]
The usb has invalid partition table, but vold thinks it has partition.
So vold not to treat entire disk as partition.

Bug: 160433451

[Test Report]
Build pass.
The special usb can mount ok.

Change-Id: I0b0e761641f6961e69d7d7f7fbc58d33eeab3a08
2024-04-17 14:54:35 +08:00
Ellen Arteca
8c903531b6 Merge "Revert^2 "Add @SensitiveData tag to IVold"" into main am: e76fb7a810 am: 03e9ac8fd0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3020145

Change-Id: I93976efdee8fff390928a91dcecededad85c75df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 23:09:24 +00:00
Ellen Arteca
03e9ac8fd0 Merge "Revert^2 "Add @SensitiveData tag to IVold"" into main am: e76fb7a810
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3020145

Change-Id: I582453bea854f63486505a77977493febb9111e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 22:54:51 +00:00
Ellen Arteca
e76fb7a810 Merge "Revert^2 "Add @SensitiveData tag to IVold"" into main 2024-04-02 22:34:27 +00:00
Ellen Arteca
3785afbdd3 Revert^2 "Add @SensitiveData tag to IVold"
This reverts commit 697c6a5217.
It is reapplying the change in I0439f63fd4739bf5a6c957695cc9c3003ec89eb0.

Reason for revert: Undoing the revert (putting the change back in); after looking at the 
performance bug, it seems impossible it was caused by the addition of the `@SensitiveData` 
tag on IVold.
Performance bug: 331045735

Bug: 320392352
Test: launch_cvd -daemon

Change-Id: I522f63836155ea404260e89fd2f209738f37d5b3
2024-03-29 21:32:40 +00:00
Ellen Arteca
3f68f4d7f9 Merge "Revert "Add @SensitiveData tag to IVold"" into main am: 366ad7a6f1 am: f450549fa3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3015100

Change-Id: I5a1ff5e2251224d96baf88e6b3b2f1c10bedfdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-27 20:19:46 +00:00
Ellen Arteca
f450549fa3 Merge "Revert "Add @SensitiveData tag to IVold"" into main am: 366ad7a6f1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3015100

Change-Id: I915c4052995e466f9e4c93c2a7a78dec09ad615a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-27 20:03:15 +00:00
Ellen Arteca
366ad7a6f1 Merge "Revert "Add @SensitiveData tag to IVold"" into main 2024-03-27 19:49:34 +00:00
Ellen Arteca
697c6a5217 Revert "Add @SensitiveData tag to IVold"
This reverts commit da1d160074.

Reason for revert: reverting while figuring out what is causing performance bug 331045735

Change-Id: Ib306e679e65c3a585304ad4c33304c549cbb240e
2024-03-27 05:30:39 +00:00
Ellen Arteca
008b823553 Merge "Add @SensitiveData tag to IVold" into main am: bb525131bb am: 551a069797
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3006939

Change-Id: Ieadc14e72e0406d6201146b2a35427bf567a8c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 21:49:47 +00:00
Ellen Arteca
551a069797 Merge "Add @SensitiveData tag to IVold" into main am: bb525131bb
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3006939

Change-Id: Iaa8e5b4daba7df88dfe6ee4a3c3dd567d62530a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 21:38:18 +00:00
Ellen Arteca
bb525131bb Merge "Add @SensitiveData tag to IVold" into main 2024-03-22 21:21:15 +00:00
Ellen Arteca
da1d160074 Add @SensitiveData tag to IVold
Mitigate data leak across the Binder boundary to Vold, of secrets derived from the LSKF.
Specifically: the `String secret` argument to both `setCeStorageProtection` and `unlockCeStorage` is
a secret derived from the user's synthetic password.

This CL is part of an effort to wipe instances of the LSKF and
secrets derived from it, so they are not available in a RAMdump.

Bug: 320392352
Test: launch_cvd -daemon

Change-Id: I0439f63fd4739bf5a6c957695cc9c3003ec89eb0
2024-03-21 23:12:18 +00:00
Treehugger Robot
b7269677a0 Merge "Revert "Reduce AppFuse max read size."" into main am: 7ed876741c am: 8a5b1dd831
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2994273

Change-Id: Idb1d002514c185ccdef4d20521db05af28348c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 15:26:41 +00:00
Treehugger Robot
8a5b1dd831 Merge "Revert "Reduce AppFuse max read size."" into main am: 7ed876741c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2994273

Change-Id: I0c9c21ca903c75d1f0f24d3e4e099976b6d40d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 15:15:22 +00:00
Treehugger Robot
7ed876741c Merge "Revert "Reduce AppFuse max read size."" into main 2024-03-21 15:01:22 +00:00
Martijn Coenen
6bce91cd30 Revert "Reduce AppFuse max read size."
This reverts commit fb014fc6e8.

Reason for revert: b/325994066

Change-Id: Ia8bb76ac69713df8bd9df5501b3dde9a86a5fd99
2024-03-08 14:37:13 +00:00
Xin Li
5b7e144777 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 300df5a5d8 -s ours am: c66e3a405c -s ours
am skip reason: Merged-In Ib360884801c37c093d9836109f0b817987abd850 with SHA-1 481c20da07 is already in history

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

Change-Id: I0b9da01887d5a64fbf8ad53a662b255b5343de8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:11:37 +00:00
Xin Li
f86de4b022 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 01c18abebc -s ours am: 094eecb08c -s ours
am skip reason: Merged-In Ib360884801c37c093d9836109f0b817987abd850 with SHA-1 481c20da07 is already in history

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

Change-Id: Iff6aee9855e4c4ab12bdcc14e7f39145957cbaa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:10:21 +00:00
Xin Li
c66e3a405c [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 300df5a5d8 -s ours
am skip reason: Merged-In Ib360884801c37c093d9836109f0b817987abd850 with SHA-1 481c20da07 is already in history

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

Change-Id: Id08e446287564a857c4415403825232eed2eb474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 08:34:42 +00:00
Xin Li
094eecb08c [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 01c18abebc -s ours
am skip reason: Merged-In Ib360884801c37c093d9836109f0b817987abd850 with SHA-1 481c20da07 is already in history

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

Change-Id: I57c50d786c7c58331be3a0e2b716067af1383b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 08:33:22 +00:00
Xin Li
300df5a5d8 Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:10:52 +00:00
Xin Li
01c18abebc Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Ib360884801c37c093d9836109f0b817987abd850
Change-Id: I29925f20f929ec0522ce12e58e8a05f44490ba88
2024-03-06 18:58:28 -08:00
Momoko Hattori
7854618d72 Merge "vold: Unmount StubVolume disks before unmounting EmulatedVolumes" into main am: 2f20c808c2 am: 481c20da07
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2850049

Change-Id: I4e057799940097a58e876be0ec2b9cbe852247d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 10:14:46 +00:00
Momoko Hattori
481c20da07 Merge "vold: Unmount StubVolume disks before unmounting EmulatedVolumes" into main am: 2f20c808c2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2850049

Change-Id: Ib360884801c37c093d9836109f0b817987abd850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 09:34:11 +00:00
Momoko Hattori
2f20c808c2 Merge "vold: Unmount StubVolume disks before unmounting EmulatedVolumes" into main 2024-03-05 08:45:29 +00:00
Eric Biggers
f4324ec4ae Merge "Delete unused code conditional on MANAGE_MISC_DIRS" into main am: cc2f93829c am: 37216f1084
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2978556

Change-Id: I0c474c32b4a01997afbc10ae7dc78468ea484d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 01:13:53 +00:00
Eric Biggers
37216f1084 Merge "Delete unused code conditional on MANAGE_MISC_DIRS" into main am: cc2f93829c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2978556

Change-Id: If24e84ecff3eff052814ec5f275d464ab9ebf0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 00:31:41 +00:00
Eric Biggers
cc2f93829c Merge "Delete unused code conditional on MANAGE_MISC_DIRS" into main 2024-02-27 23:51:33 +00:00
Eric Biggers
d0e9a59885 Delete unused code conditional on MANAGE_MISC_DIRS
Since MANAGE_MISC_DIRS is hardcoded to 0, and it always has been, there
is no need to have it in the code.

Test: build
Change-Id: I30a73e67999841271e07dbc3eeb1b8568529a7c3
2024-02-27 03:00:34 +00:00
Momoko Hattori
b4e033ed4c vold: Unmount StubVolume disks before unmounting EmulatedVolumes
The current shutdown / reset logic in VolumeManager unmounts
EmulatedVolume first, and unmounts the other disks.

In ARC (Android on ChromeOS), ChromeOS Downloads directory (exposed from
ChromeOS to Android as a disk having StubVolume) is bind-mounted to
/data/media/0/Download in the ARC-customized version of
StubVolume::doMount() (http://shortn/_lKaAhTLhY3), and the current
unmount order causes EmulatedVolume not to be cleanly unmounted. This
patch hence changes the order of the unmount of volumes to first unmount
StubVolume disks, then unmount the EmulatedVolumes, then unmount the
non-StubVolume disks.

Bug: 304369444
Test: On an Android phone, create a virtual public volume with the
  following commands on adb shell (taken from
  android.scopedstorage.cts.lib.TestUtils.createNewPublicVolume()):
  $ sm set-force-adoptable on
  $ sm set-virtual-disk true
  $ sm list-disks  # <- This returns the virtual disk name
  $ sm partition <virtual disk name> public
  Then, run `vdc volume reset` on lynx adb shell, observe logcat from
  vold and check that no error is observed.
Test: Run `vdc volume reset` on ARC adb shell, and confirm that:
  * Without this patch, the primary emulated volume fails to unmount
    with "Device or resource busy", followed by MyFiles volume unmount.
  * With this patch, MyFiles volume is unmounted before the primary
    emulated volume, and no error is observed.

Change-Id: I54f60e3320574ccf8d3589545ff77967fff14fc7
2024-02-22 18:07:18 +09:00
Treehugger Robot
b198cf9540 Merge "Reduce AppFuse max read size." into main am: 527a52874e am: f291279b12
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2859125

Change-Id: Ic9b4a36e68e1228fb504d2e8068c076e2f708a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-19 12:00:03 +00:00
Treehugger Robot
f291279b12 Merge "Reduce AppFuse max read size." into main am: 527a52874e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2859125

Change-Id: Ib3c5e4302d38e527d3c15e94b25991994ea9bdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-19 11:19:41 +00:00
Treehugger Robot
527a52874e Merge "Reduce AppFuse max read size." into main 2024-02-19 10:39:40 +00:00
David Anderson
4ed5b5f4b5 Merge "Add API to get remaining lifetime as a percentage." into main am: f75d8fc237 am: 3774a02e66
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2940229

Change-Id: Ib004cb63ef91f30a7df230f99c732dce9eccd6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 06:07:25 +00:00
David Anderson
3774a02e66 Merge "Add API to get remaining lifetime as a percentage." into main am: f75d8fc237
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2940229

Change-Id: Ifbecbd4442b970b87605b6c223e89efd11f5bcba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 05:27:53 +00:00
David Anderson
f75d8fc237 Merge "Add API to get remaining lifetime as a percentage." into main 2024-02-01 04:51:03 +00:00
David Anderson
0620564ecb Add API to get remaining lifetime as a percentage.
This differs slightly from the previous API, which exists for idle
maintenance, whereas this value is intended to be displayed to users.
First, it returns remaining lifetime, rather than used lifetime. Second,
it rounds up the returned value for usabilty purposes. This isn't an
issue on Pixel (which reports at 1% granularity), but devices which
report at 10% granularity should show 100% out-of-box, which is not
possible to distinguish in the old API.

Bug: 309886423
Test: StorageManager.getRemainingStorageLifetime
Change-Id: Ic5f6ec9969667302ba8bad95b2765e2cc740bed4
2024-01-31 22:50:18 +00:00
Xin Li
8e0120892b [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: eb6960e364 -s ours
am skip reason: Merged-In I8efef8efbc9f01e1177fbe3105513166ad90d22f with SHA-1 f428f9e6f0 is already in history

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

Change-Id: I9e95e86c1cc2e8a3c1f0c54357b747f4ee383d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:03:08 +00:00
Xin Li
eb6960e364 Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I8efef8efbc9f01e1177fbe3105513166ad90d22f
Change-Id: If7ebdccc494c7edb5b1603eb3154ca508e14dc33
2024-01-23 22:16:46 -08:00
Neil Fuller
2f22bd0f3f Merge "Add time_offset=<UTC offset> to mount arguments" into main am: 5b711b10db am: bb1f4dcdbd
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2901301

Change-Id: I430cf7e7004faa43cf0b258248b29803a12335d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 18:43:54 +00:00
Neil Fuller
bb1f4dcdbd Merge "Add time_offset=<UTC offset> to mount arguments" into main am: 5b711b10db
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2901301

Change-Id: I96fac82b8cbad9f471b0dbcb26ac6fbc54a51273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 18:01:13 +00:00
Neil Fuller
5b711b10db Merge "Add time_offset=<UTC offset> to mount arguments" into main 2024-01-19 17:26:00 +00:00