summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-19Snap for 9966400 from 9adf86a88189af16e04e8b439bd2e5078acadb4d to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-releaseAndroid Build Coastguard Worker
Change-Id: I06a38c24ed5950ef69cc392c71fc4f02a2714278
2023-04-14Log reason for fuse-bpf being enabled/disabledandroid14-devPaul Lawrence
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-13Snap for 9930594 from ee0a2bf52ec298d6c9b0f93e92332cd091cdcbba to udc-releaseAndroid Build Coastguard Worker
Change-Id: If66e2dba4ec84bb22f7268f5a5abdd772fb000a8
2023-04-12Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" ↵Paul Lawrence
into udc-dev
2023-04-12Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641 am: e9eee2b50eSteven Moreland
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-12Merge "Explicit init .rc user." am: 6c8b6e1651 am: 0b6dd2c641Steven Moreland
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-12Merge "Explicit init .rc user." am: 6c8b6e1651Steven Moreland
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-11Merge "Explicit init .rc user."android-u-beta-1-gplSteven Moreland
2023-04-10Explicit init .rc user.Steven Moreland
Set the user explicitly. Bug: 276813155 Test: boot Change-Id: I54c14c47a3435d72e00280cf663f23ffbb9659ee
2023-04-03Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpfPaul Lawrence
Bug: 262887267 Test: ro.fuse.bpf.is_running is true Ignore-AOSP-First: This breaks multiple tests because the rest of fuse_bpf is not in aosp Change-Id: I3c41c7a0992803a100a1a7eeecd2c5f57e6085fd
2023-03-30Snap for 9849129 from bfb937b0683e84be04fbac3142bb5e5eb32465ba to udc-releaseAndroid Build Coastguard Worker
Change-Id: I9dbcee8c34a77283d921fe9f3a3b13024f1654ae
2023-03-28Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb am: ↵Daeho Jeong
d4680bb584 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268 Change-Id: I97a52712004285b30340f428f280abe43a0c7a7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fbDaeho Jeong
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268 Change-Id: I697ba818c7399584b81c831eb14a8a4d55be7cee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28Merge "vold: fix write kbytes handling" am: 13a57d2a26Daeho Jeong
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268 Change-Id: I0ea8d3eb6fe49612077a23b30a5fce5a7627a871 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28Merge "vold: fix write kbytes handling"Daeho Jeong
2023-03-27vold: fix write kbytes handlingDaeho Jeong
Since Android platform codespace doesn't support exception handling, we use strtoll() instead of stoll for direct error handling. Bug: 274369737 Test: check smart idle maintenace service log Change-Id: I57c709b1e329228790e0a883edb64dc023135a24
2023-03-18Snap for 9769041 from 99b2289954f56a08a1c2ca794451e7920f1a289d to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ifdfecbbcb2007dcb9af7eb606218e4ac4ef1c46e
2023-03-17Snap for 9762093 from f15652879e95e3858ae80bc2f2a91662374e9e17 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I1df13f02b851821e700979de5ab5685f499a6e3c
2023-03-17[automerger skipped] Clean up potential busy files after key eviction. am: ↵Nathan Huckleberry
759ac5f87c -s ours am: e828c966e3 -s ours am skip reason: Merged-In I9e39e5bb0f5190284552bcd252b6213a22a51e91 with SHA-1 a21962b207 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/21649087 Change-Id: Ic60f93e88d4ab638bd88bb595059d9d419307fb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17[automerger skipped] Clean up potential busy files after key eviction. am: ↵Nathan Huckleberry
759ac5f87c -s ours am skip reason: Merged-In I9e39e5bb0f5190284552bcd252b6213a22a51e91 with SHA-1 a21962b207 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/21649087 Change-Id: I16aa0e7cfe276c918affdbddc58e593e2f1c2eeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a am: 0d069ca15aPawan Wagh
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755 Change-Id: I489e84ee7c4c2212eb5a810c9d3f18ad37e734af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5aPawan Wagh
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755 Change-Id: Ic386ce0bc09e0b0cafdce9c612a278aff6fccb36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Merge "Set sehandle in voldFuzzer" am: c1572fe8cfPawan Wagh
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755 Change-Id: I60003de6b4df333663c168483acc5d967c16dd84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Merge "Set sehandle in voldFuzzer"Pawan Wagh
2023-03-15Set sehandle in voldFuzzerPawan Wagh
Bug: 271649747 Test: m vold_native_service_fuzzer && adb sync && adb shell data/fuzz/x86_64/vold_native_service_fuzzer/vold_native_service_fuzzer Change-Id: I55a17ffd631b0b85e2fc049bffe9a91623699e64
2023-03-05Snap for 9690662 from 10f3d7ec328694631cb4ecbfe085205129f6562c to udc-releaseAndroid Build Coastguard Worker
Change-Id: Icab7003bace3645156505d7c048d01435d0c628d
2023-03-04Merge "Avoid error message when destroying key w/o secdiscardable file" am: ↵Eric Biggers
dc262c27f0 am: 60c71b9950 am: 2ef1832ac4 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460 Change-Id: I9a0edebc0100cd56077e95ff5adb3f40d7b5129f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04Merge "Avoid error message when destroying key w/o secdiscardable file" am: ↵Eric Biggers
dc262c27f0 am: 60c71b9950 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460 Change-Id: I3c1ccbf5a48de8281db1244471f40831e32decbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04Merge "Avoid error message when destroying key w/o secdiscardable file" am: ↵Eric Biggers
dc262c27f0 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460 Change-Id: I0259a28cc469a98149512f258751771f09112fda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Avoid error message when destroying key w/o secdiscardable file"Eric Biggers
2023-03-03Avoid error message when destroying key w/o secdiscardable fileEric Biggers
Since commit 08f4bdfe9836 ("Don't use a secdiscardable file for keys encrypted by SP") (https://r.android.com/2242561), some keys don't use a secdiscardable file. Currently if such a key is destroyed, an ERROR message like the following is logged: E secdiscard: Secure discard open failed for: /data/misc/vold/user_keys/ce/14/current/secdiscardable This case is expected, so it should not be an ERROR. Fix this by only passing the secdiscardable file to the secdiscard program if it exists. Bug: 232452368 Change-Id: I490289dfdaf0db6c3f4fb507509095e0033e2f69
2023-03-03Snap for 9682161 from 13c2e12a5a00674861967048d2a49c773c75d84b to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ib011205f668d6222093b7fd9fa5dfef6a1260ac9
2023-03-02Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5 am: ↵Eric Biggers
44d3181bc5 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051 Change-Id: Ie71dab9cd4818e1ab7d37c5442b451776451b328 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051 Change-Id: I25c3b804e4e4814a357d8428231c42a33a5f01d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Check for SELinux labelling errors" am: 826eef6b33Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051 Change-Id: I55ae26d92455278fb9e687571392083c5859e4d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Check for SELinux labelling errors"Eric Biggers
2023-03-02Snap for 9675941 from 6ed36540331727c2d628273791e911c70b3f1e8b to udc-releaseAndroid Build Coastguard Worker
Change-Id: I2552c0124fd8f273d4c021f98c0b49d256e17638
2023-03-01Check for SELinux labelling errorsEric Biggers
It's essential that files created by vold get the correct SELinux labels, so make sure to check for errors when setting them. ENOENT (no label defined) is expected on some files such as /mnt/appfuse/*, so allow ENOENT but log a DEBUG message. This will help debug b/269567270. This is not a fix for b/269567270. Bug: 269567270 Test: Created user and checked SELinux labels of user's directories Test: atest CtsBlobStoreHostTestCases Change-Id: Ife005bdd896952653943c57336deb33456f7c5d8
2023-03-01Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 ↵Austin Delgado
am: 9a4265cc20 am: edb3220e2b Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593 Change-Id: I9839fde4983f0ef66e5da75f9ad26537765b4773 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 ↵Austin Delgado
am: 9a4265cc20 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593 Change-Id: Ia7bd2386936b722f2c4effa3f2615caa11918353 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758Austin Delgado
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593 Change-Id: Id02634939a86d6fb05b8a2762c4a6cb161ed7476 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "Revert "Strictly check for SELinux labelling errors""Austin Delgado
2023-02-28Revert "Strictly check for SELinux labelling errors"Austin Delgado
This reverts commit 2ef4e85448df5767b98e0d1dc793b7805249393f. Reason for revert: b/271157681 Change-Id: I7224fd68027e2e9824694171547b8b2c808f9923
2023-02-28Merge "Strictly check for SELinux labelling errors" am: 5554b80afb am: ↵Eric Biggers
d8bf3b2681 am: 2df74f43c0 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2456274 Change-Id: I0d2c7197660c0a3b1428c5ebe6904fd4db7f1a61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "Strictly check for SELinux labelling errors" am: 5554b80afb am: ↵Eric Biggers
d8bf3b2681 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2456274 Change-Id: Iaac9bc0c82a43a4808cec59867320ff6084cff67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "Strictly check for SELinux labelling errors" am: 5554b80afbEric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2456274 Change-Id: I7c4ab5c3fdfbda22b24a8875915f3acfef1b8003 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "Strictly check for SELinux labelling errors"Eric Biggers
2023-02-28Clean up potential busy files after key eviction.android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseNathan Huckleberry
There is a race condition between key eviction and killing user processes. The race condition is difficult to properly fix without significantly degrading UI performance. If the race condition occurs, decrypted filesystem data is left in various kernel caches. To mitigate, we try to ensure the caches are flushed by evicting the keys again in a worker thread. Test: Checked that the correct log messages appear when evicting a user's keys Bug: 140762419 Change-Id: I9e39e5bb0f5190284552bcd252b6213a22a51e91 (cherry picked from commit a21962b207ebab74c333c95abaca103bc938f38d) Merged-In: I9e39e5bb0f5190284552bcd252b6213a22a51e91
2023-02-27Strictly check for SELinux labelling errorsEric Biggers
It's essential that files created by vold get the correct SELinux labels, so make sure to check for errors when setting them. This will help debug b/269567270. This is not a fix for b/269567270. Bug: 269567270 Test: Created user and checked SELinux labels of user's directories Change-Id: I99e4d530a00f9401532c9cb0990df254b7a12a80
2023-02-26Snap for 9657362 from ca088076171f5c6145e78fe761534fad25883138 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I329647c423ff08739fea82f979c648a3c1c253f9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:56:55 +0000