Commit graph

6300 commits

Author SHA1 Message Date
Paul Lawrence
7278162512 Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf
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-04-03 16:55:45 +00:00
Daeho Jeong
bfbb254018 Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb am: d4680bb584 am: bfb937b068 am: 0635cf3917
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268

Change-Id: Ia8753ac3657e384e00de729967e85b389daa1fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 23:53:25 +00:00
Daeho Jeong
8d2c985872 Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb am: d4680bb584 am: bfb937b068 am: 94b8839296
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268

Change-Id: Ic65ee76d6ab9b4b98f7acd49798e8ff7f2c3fc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 23:33:56 +00:00
Daeho Jeong
0635cf3917 Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb am: d4680bb584 am: bfb937b068
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268

Change-Id: I4dc76496659ca8cc3c773a5ec05ec75bd7d4af04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:13:43 +00:00
Daeho Jeong
94b8839296 Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb am: d4680bb584 am: bfb937b068
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268

Change-Id: I9a7ed05e306d9293d0a411a9500108257b38c4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:06:05 +00:00
Daeho Jeong
bfb937b068 Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb am: 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-28 21:29:55 +00:00
Daeho Jeong
d4680bb584 Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb
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-28 21:11:18 +00:00
Daeho Jeong
486c3507fb Merge "vold: fix write kbytes handling" am: 13a57d2a26
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-28 20:40:45 +00:00
Daeho Jeong
13a57d2a26 Merge "vold: fix write kbytes handling" 2023-03-28 20:15:53 +00:00
Daeho Jeong
dd08c52eb8 vold: fix write kbytes handling
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-27 18:19:18 -07:00
Automerger Merge Worker
d0fbd537a9 Merge "[automerger skipped] Clean up potential busy files after key eviction. am: 759ac5f87c -s ours am: e828c966e3 -s ours am: 99b2289954 -s ours am: c8e91cbe05 -s ours" 2023-03-17 02:29:59 +00:00
Nathan Huckleberry
3b09ed3052 [automerger skipped] Clean up potential busy files after key eviction. am: 759ac5f87c -s ours am: e828c966e3 -s ours am: 99b2289954 -s ours am: c8e91cbe05 -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: I0c3acd182a2130be20e5d6af288690b12d7734ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 02:29:53 +00:00
Nathan Huckleberry
9c6cc884c7 [automerger skipped] Clean up potential busy files after key eviction. am: 759ac5f87c -s ours am: e828c966e3 -s ours am: 99b2289954 -s ours am: 2ec6f0acf0 -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: Id71368e50c9bc5f0763e4b192410101990bf490f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 02:29:33 +00:00
Nathan Huckleberry
2ec6f0acf0 [automerger skipped] Clean up potential busy files after key eviction. am: 759ac5f87c -s ours am: e828c966e3 -s ours am: 99b2289954 -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: I91b9dd370f3a4be3b3a83431f0ba7bc051e2d94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 01:42:15 +00:00
Nathan Huckleberry
c8e91cbe05 [automerger skipped] Clean up potential busy files after key eviction. am: 759ac5f87c -s ours am: e828c966e3 -s ours am: 99b2289954 -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: I01afc890850f48c70cd60cdc568a06ff5b13a5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 01:40:49 +00:00
Nathan Huckleberry
99b2289954 [automerger skipped] Clean up potential busy files after key eviction. am: 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 01:03:12 +00:00
Nathan Huckleberry
e828c966e3 [automerger skipped] Clean up potential busy files after key eviction. am: 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-17 00:26:48 +00:00
Pawan Wagh
a177213cc3 Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a am: 0d069ca15a am: f15652879e am: 1b09a317df
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755

Change-Id: Id9016a9f89b0c53f9c3c32a72e9477a8e57420b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 10:38:36 +00:00
Pawan Wagh
44e3b6745a Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a am: 0d069ca15a am: f15652879e am: 8d8b3253f1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755

Change-Id: I031f9f2f6209e891b03ff239f06c5e20e4b372ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 10:37:10 +00:00
Pawan Wagh
1b09a317df Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a am: 0d069ca15a am: f15652879e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755

Change-Id: I4a06d795d1b0bba6587b7a76310cdab519f6462f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 10:02:36 +00:00
Pawan Wagh
8d8b3253f1 Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a am: 0d069ca15a am: f15652879e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2492755

Change-Id: I186ac3842169320eb94516ba8047bfc318c1da82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 10:02:35 +00:00
Pawan Wagh
f15652879e Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a am: 0d069ca15a
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-16 09:25:41 +00:00
Pawan Wagh
0d069ca15a Merge "Set sehandle in voldFuzzer" am: c1572fe8cf am: b43fe97e5a
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-16 08:47:39 +00:00
Pawan Wagh
b43fe97e5a Merge "Set sehandle in voldFuzzer" am: c1572fe8cf
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-16 08:10:28 +00:00
Pawan Wagh
c1572fe8cf Merge "Set sehandle in voldFuzzer" 2023-03-16 07:28:40 +00:00
Pawan Wagh
25effc38ff Set sehandle in voldFuzzer
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-15 20:54:42 +00:00
Eric Biggers
7b7b1e8a42 Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27f0 am: 60c71b9950 am: 2ef1832ac4 am: 10f3d7ec32 am: 6bcbb52536
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460

Change-Id: Ie02fea3f7bc444b3aeb89442e29099507cc1cfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 09:13:47 +00:00
Eric Biggers
a8a1f0029a Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27f0 am: 60c71b9950 am: 2ef1832ac4 am: 10f3d7ec32 am: 9e23078702
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460

Change-Id: I0a564f52364bff82b5fc3655654ab43acee1c0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 09:06:41 +00:00
Eric Biggers
6bcbb52536 Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27f0 am: 60c71b9950 am: 2ef1832ac4 am: 10f3d7ec32
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460

Change-Id: I21d1b7408545e709fc492773bf093227373feaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 08:31:02 +00:00
Eric Biggers
9e23078702 Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27f0 am: 60c71b9950 am: 2ef1832ac4 am: 10f3d7ec32
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460

Change-Id: I069d4cb6fb7e07fee3139c3036ccf92c5d5078ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 08:28:24 +00:00
Eric Biggers
10f3d7ec32 Merge "Avoid error message when destroying key w/o secdiscardable file" am: 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-04 07:49:59 +00:00
Eric Biggers
2ef1832ac4 Merge "Avoid error message when destroying key w/o secdiscardable file" am: 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-04 07:16:23 +00:00
Eric Biggers
60c71b9950 Merge "Avoid error message when destroying key w/o secdiscardable file" am: 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-04 06:30:21 +00:00
Eric Biggers
dc262c27f0 Merge "Avoid error message when destroying key w/o secdiscardable file" 2023-03-03 22:14:58 +00:00
Eric Biggers
73e2936fc2 Avoid error message when destroying key w/o secdiscardable file
Since commit 08f4bdfe98 ("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-03 19:51:36 +00:00
Eric Biggers
f7edb44fb6 Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5 am: 44d3181bc5 am: 13c2e12a5a am: 53b0fcc994
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051

Change-Id: I0e2a8a89b98235c5ee8bc1a11a29c3d223f342f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:17:49 +00:00
Eric Biggers
0001466aa6 Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5 am: 44d3181bc5 am: 13c2e12a5a am: 3b9d19f52c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051

Change-Id: I71982170ab9b98fde2d6d3a4c10abf91d1700aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:01:00 +00:00
Eric Biggers
3b9d19f52c Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5 am: 44d3181bc5 am: 13c2e12a5a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051

Change-Id: Ie7b1a2da744300cfb91927705466eb3be5cad23f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:28:41 +00:00
Eric Biggers
53b0fcc994 Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5 am: 44d3181bc5 am: 13c2e12a5a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2465051

Change-Id: I3fd4f932a08debd717026026d9b23a2cae88b8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:23:47 +00:00
Eric Biggers
13c2e12a5a Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5 am: 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-02 20:27:49 +00:00
Eric Biggers
44d3181bc5 Merge "Check for SELinux labelling errors" am: 826eef6b33 am: 0c7abb02e5
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-02 19:49:30 +00:00
Eric Biggers
0c7abb02e5 Merge "Check for SELinux labelling errors" am: 826eef6b33
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-02 19:14:42 +00:00
Eric Biggers
826eef6b33 Merge "Check for SELinux labelling errors" 2023-03-02 18:35:16 +00:00
Eric Biggers
c7c4f5a902 Check for SELinux labelling errors
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-01 22:11:29 +00:00
Austin Delgado
d4f0c79fb5 Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 am: 9a4265cc20 am: edb3220e2b am: 6ed3654033 am: bd79cf1cb0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593

Change-Id: Ic11c86f95e156493eb8796d250c0e4821a88d693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 02:10:39 +00:00
Austin Delgado
10c408e97f Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 am: 9a4265cc20 am: edb3220e2b am: 6ed3654033 am: 349dda09f2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593

Change-Id: Ie40234ff9cd76c9fc4d122dd40a3604ea42f30ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 02:09:14 +00:00
Austin Delgado
349dda09f2 Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 am: 9a4265cc20 am: edb3220e2b am: 6ed3654033
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593

Change-Id: I363320f5d2af4663b0a4179afea0035274113b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:13:11 +00:00
Austin Delgado
bd79cf1cb0 Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 am: 9a4265cc20 am: edb3220e2b am: 6ed3654033
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2461593

Change-Id: Id992e07388777ffb57ff0197b6d41db60e0f96a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:12:27 +00:00
Austin Delgado
6ed3654033 Merge "Revert "Strictly check for SELinux labelling errors"" am: 545f0ab758 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-03-01 00:19:37 +00:00
Eric Biggers
c8e993fd55 Merge "Strictly check for SELinux labelling errors" am: 5554b80afb am: d8bf3b2681 am: 2df74f43c0 am: f65f63a29c am: 3c69beeb5a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2456274

Change-Id: I858255f9403e042eef5cacee359c6540bc34096a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:46:42 +00:00