Commit graph

3753 commits

Author SHA1 Message Date
Treehugger Robot
48b6b1c767 Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1427711

Change-Id: I65c09190aa8f6e61bda750980bfdcc06e0306d4b
2020-09-16 02:26:57 +00:00
Treehugger Robot
c9548b9d9e Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1427711

Change-Id: I0254ee7e493f98a78476f2e939884185b04d10c0
2020-09-16 02:04:55 +00:00
Treehugger Robot
4e6e7e6c70 Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" 2020-09-16 01:24:16 +00:00
Eric Biggers
b67708361f vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION
Nothing defines CONFIG_HW_DISK_ENCRYPTION, so remove the unused code
that's conditional on it being defined.

Change-Id: Ie435e138686eb4eac47d9aa762ae06f1645a117f
2020-09-15 11:57:30 -07:00
Daeho Jeong
79dfe789d9 Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1420895

Change-Id: I51b4ca860a8222a2a978ea96cbd68d53262ac2e3
2020-09-15 00:45:22 +00:00
Daeho Jeong
58383d92c6 Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1420895

Change-Id: I84cf17d8dd07c72a67beba46a814f51969a159ac
2020-09-15 00:13:38 +00:00
Daeho Jeong
c5ff520a01 Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" 2020-09-14 23:50:17 +00:00
Daeho Jeong
d1b946ea9f secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard
A new interface, F2FS_IOC_SEC_TRIM_FILE, has been added to F2FS
filesystem to send secure discard command to a specific file,
not to block device. We can use this interface for better discard
command handling on a file basis.

[how to use F2FS_IOC_SEC_TRIM_FILE]
start: start offset in byte (should be aligned with 4096)
len: length in byte (should be aligned with 4096, except designating EOF)
     -1 also means till EOF.
flags: F2FS_TRIM_FILE_DISCARD - sending secure discard command. If the
                                device doesn't support it, send normal
                                discard.
       F2FS_TRIM_FILE_ZEROOUT - overwrite zero data in the file.

Bug: 140759142
Test: execute "secdiscard -- <file_path>" and check the content of file
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I6ee44a047d291274c9d70ae5e4ccccfc06a52f89
2020-09-14 08:43:15 +09:00
Treehugger Robot
95177aab00 [automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours
am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: Iba1f2ef22059f905091e742f8041e675a6f76d77
2020-09-11 09:29:33 +00:00
Treehugger Robot
5724e15454 Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1400407

Change-Id: I44aea35571e4dff7f9f1010325f51d0e98dc01f1
2020-09-11 08:40:46 +00:00
Treehugger Robot
f7794b5dc1 Merge "Add '-unstable' to solve ODR violation" 2020-09-11 08:19:44 +00:00
Jeongik Cha
f8f374a381 Add '-unstable' to solve ODR violation
The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Merged-In: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Exempt-From-Owner-Approval: cp from internal
2020-09-11 06:49:21 +00:00
Xin Li
a56f7d2608 [automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866 -s ours
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

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

Change-Id: Ic319ade87dab6280b771d6f8d91d7bfde3a056fe
2020-09-11 02:02:43 +00:00
Xin Li
789d1d0866 [automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

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

Change-Id: I78dff452b759e863b082f44b76fb5ae9a83cb704
2020-09-11 00:40:18 +00:00
Xin Li
141c2027e2 Merge "Merge Android R" 2020-09-10 17:22:31 +00:00
Xin Li
1ef819d16a Merge Android R
Bug: 168057903
Merged-In: I477d2dfba05718c829fdb2099248a8baba1125ab
Change-Id: Ib60b99425dc79ca4c5b23772f32036f4e17ad11f
2020-09-09 20:21:28 -07:00
Treehugger Robot
6bc12b0352 Merge "bench: Add inodeop_bench benchmark" am: e804806d79 am: 8743ef4ea6
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048

Change-Id: I1071fd34394aefcc2fc2e5bfd29e97df6dc28072
2020-09-09 13:50:13 +00:00
Treehugger Robot
8743ef4ea6 Merge "bench: Add inodeop_bench benchmark" am: e804806d79
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048

Change-Id: I477d2dfba05718c829fdb2099248a8baba1125ab
2020-09-09 13:34:41 +00:00
Treehugger Robot
e804806d79 Merge "bench: Add inodeop_bench benchmark" 2020-09-09 13:03:12 +00:00
Stefano Duo
046c854ae9 bench: Add inodeop_bench benchmark
Add new benchmark capable of generating specific inode operations
workloads. Currently, it supports create, delete, move, hardlink and
symlink.

Test: Manual run on cuttlefish and physical device
Bug: 165903680
Signed-off-by: Stefano Duo <stefanoduo@google.com>
Change-Id: Ia47f259b7ccea5fe1665b272c3cbc9ec1bf2eb56
2020-09-08 16:21:14 +00:00
Xin Li
f13d17f2b8 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours
am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

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

Change-Id: Id0bdc9b0190233ed0384b52a5844597b337833e1
2020-09-01 20:37:11 +00:00
Xin Li
24ae202734 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627
Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695
2020-08-27 10:17:42 -07:00
Jeongik Cha
44b2f954be Add '-unstable' to solve ODR violation
The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
2020-08-14 14:56:23 +00:00
Treehugger Robot
abd6f5a165 Merge "Add maco@ to vold OWNERS." am: 157a08bb92 am: 3d1b6ac7c0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467

Change-Id: I02184aa11a783fb3201812d2a8f64faca981cbc2
2020-08-11 11:13:35 +00:00
Treehugger Robot
3d1b6ac7c0 Merge "Add maco@ to vold OWNERS." am: 157a08bb92
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467

Change-Id: I0d0a8048465e190105f03dfe76fbf5c8393a4198
2020-08-11 10:56:15 +00:00
Treehugger Robot
157a08bb92 Merge "Add maco@ to vold OWNERS." 2020-08-11 10:34:17 +00:00
Martijn Coenen
494b67bfcb Add maco@ to vold OWNERS.
Bug: N/A
Test: N/A
Change-Id: Ib00991eccbd33e719a64d55da932f7f2bfab7b71
2020-08-11 09:13:58 +02:00
Eric Biggers
124f3575be Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128

Change-Id: I14257e5e427795e8871de5df94696e49766566a6
2020-08-10 23:10:18 +00:00
Eric Biggers
c6f47996d6 Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128

Change-Id: Iacb41f3dba6c2a57943f766b749d87efe6f4e4b3
2020-08-10 22:53:51 +00:00
Eric Biggers
ee1a70c129 Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" 2020-08-10 22:35:21 +00:00
Eric Biggers
72d07130ac vold: use __ANDROID_API_Q__ instead of pre_gki_level
The name "pre_gki_level" is causing some confusion because not all
devices launching with Android R are subject to the GKI requirement.
(See b/161563110#comment11.)  E.g., devices that use a 4.14-based kernel
are exempt from GKI.  However, the encryption requirements still apply.

Just use __ANDROID_API_Q__ directly instead.

No change in behavior.

Change-Id: Id02ae1140845ac1ae7cf78be4e57fe34da028abf
2020-08-10 11:45:08 -07:00
Eric Biggers
d1a7e750e2 Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029

Change-Id: I28615b8a9a656804b8ebacff0876e2acb1a64c1f
2020-08-10 18:22:03 +00:00
Eric Biggers
5acfc3e8d5 Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029

Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674
2020-08-10 18:04:57 +00:00
Eric Biggers
213dbe30a1 Merge "EncryptInPlace: ensure that backup superblocks get encrypted" 2020-08-10 17:52:39 +00:00
Will Shiu
4ac43f0e16 EncryptInPlace: ensure that backup superblocks get encrypted
Block groups with EXT4_BG_BLOCK_UNINIT still have backup superblocks
(and backup block group descriptors).  Fix EncryptInPlace to encrypt
these backup superblocks rather than leave them unencrypted.

Previously leaving the backup superblocks unencrypted didn't cause any
problems, but due to system/core commit 72abd7b246f7 ("Try to recover
corrupted ext4 /data with backup superblock") it is causing problems.

Bug: 162479411
Bug: 161871210
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e
2020-08-06 11:05:45 -07:00
Treehugger Robot
dd8b695c61 Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586

Change-Id: Id417587a550b0f4abf5a6a3e4b4535011b21f627
2020-07-17 19:02:45 +00:00
Treehugger Robot
bb92ff6591 Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586

Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a
2020-07-17 18:38:05 +00:00
Treehugger Robot
5de675c93b Merge "vold: restore -D__ANDROID_DEBUGGABLE__" 2020-07-17 18:24:51 +00:00
Mark Salyzyn
865086debe vold: restore -D__ANDROID_DEBUGGABLE__
Regression introduced by
commit 7ebcc2bcfd
("Revert "[Vold] Conditional dependency to ARC++ ObbVolume"")
errantly removed the product_variables support for
-D__ANDROID_DEBUGGABLE__ when built for userdebug builds.

Restore stanza.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 161454607
Test: adb-remount-test no longer reports a problem
Change-Id: Ia7e55d1174fa7fac2d934d4aac06d15e8be388af
2020-07-17 08:20:00 -07:00
Eric Biggers
d0b2751e8f Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220

Change-Id: Ia7fca6e61c58317002271c8338bb01a12e8223a5
2020-07-17 01:50:24 +00:00
Eric Biggers
6b36554b38 Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: Iffa50e4c549469de6425134369e609856f1d7813
2020-07-17 01:50:07 +00:00
Eric Biggers
350b5ae900 Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220

Change-Id: I94b778955b2ee5cd8c462050e94c39ce05c96179
2020-07-17 01:38:51 +00:00
Eric Biggers
83a3eecc03 Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: If47e4ced3b37e44772d802fb8ebe2d9ad51c03e2
2020-07-17 01:38:44 +00:00
Eric Biggers
256b23b1c5 Merge "KeyUtil: use static local variable in isFsKeyringSupported()" 2020-07-17 01:20:43 +00:00
Eric Biggers
47425d05a9 Merge "vold: drop local fscrypt UAPI definitions" 2020-07-17 01:19:39 +00:00
Eric Biggers
e0217d7b9e vold: drop local fscrypt UAPI definitions
Now that Bionic's copy of <linux/fscrypt.h> has been updated, there's no
need for vold to carry its own fscrypt_uapi.h.

Test: build
Change-Id: I61581ac74f7cf77bc8a835e64d96553a9d0c517a
2020-07-16 16:34:07 -07:00
Eric Biggers
7604eb97bc KeyUtil: use static local variable in isFsKeyringSupported()
Use C++'s built-in mechanism for one-time initialization rather than
implement it ourselves in a way that isn't thread-safe.

(It doesn't *actually* need to be thread-safe, since all callers of this
run under ACQUIRE_CRYPT_LOCK.  But that's not easy to verify.)

Test: booted Cuttlefish and checked log for the one-time message
      "Detected support for FS_IOC_ADD_ENCRYPTION_KEY"
Change-Id: I6ca5b143ca305fa95144e388efc9657e3507bf05
2020-07-16 16:17:16 -07:00
Eric Biggers
4cd238b900 Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: I23b9a01632b61a92896ae83e2152fa047dd85c48
2020-07-16 21:00:33 +00:00
Eric Biggers
15c0d3e5d0 Merge "vold: remove checkEncryption" am: 2d9777bfbf
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: I4ffa4a351292c18dce51247d926ffe7efdbd5bea
2020-07-16 20:45:57 +00:00
Eric Biggers
2d9777bfbf Merge "vold: remove checkEncryption" 2020-07-16 20:30:35 +00:00