Google Git
Sign in
android / platform / system / vold / 006eed8e3ad8b38915c55092346fb149298975a0
commit006eed8e3ad8b38915c55092346fb149298975a0[log] [tgz]
authorEric Biggers <ebiggers@google.com>Mon Jul 06 13:46:38 2020 -0700
committerEric Biggers <ebiggers@google.com>Tue Jul 07 10:08:22 2020 -0700
treecb2762ef9c3a5db376fdccd9480c23e5c380148e
parenta485006ab147695fa28ec20c11ffef4f018253a3 [diff]
vold: only allow emmc_optimized on eMMC storage

The emmc_optimized encryption flag is specifically designed for the
limitations of inline encryption hardware that follows the eMMC
standard.  It isn't appropriate to use on other types of storage.
So, make vold enforce that it's not used on other types of storage.

Bug: 160639344
Test:
  - Enabled emmc_optimized on Cuttlefish and verified it no longer boots
  - Using a modified version of this change, verified that
    IsEmmcStorage() works as expected on various devices including
    Cuttlefish, Cuttlefish booted in GSI image mode, a device with eMMC
    storage, and a device with UFS storage.
  - Verified that VtsKernelEncryptionTest still passes
Change-Id: Ie27b80658db53b1a4207b3cbb4e309d05130812e
Merged-In: Ie27b80658db53b1a4207b3cbb4e309d05130812e
1 file changed
tree: cb2762ef9c3a5db376fdccd9480c23e5c380148e
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format ⇨ ../../build/soong/scripts/system-clang-format
  7. Android.bp
  8. AppFuseUtil.cpp
  9. AppFuseUtil.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. CheckEncryption.cpp
  14. CheckEncryption.h
  15. Checkpoint.cpp
  16. Checkpoint.h
  17. CleanSpec.mk
  18. cryptfs.cpp
  19. cryptfs.h
  20. CryptoType.cpp
  21. CryptoType.h
  22. Devmapper.cpp
  23. Devmapper.h
  24. EncryptInplace.cpp
  25. EncryptInplace.h
  26. FileDeviceUtils.cpp
  27. FileDeviceUtils.h
  28. FsCrypt.cpp
  29. FsCrypt.h
  30. fscrypt_uapi.h
  31. IdleMaint.cpp
  32. IdleMaint.h
  33. KeyBuffer.cpp
  34. KeyBuffer.h
  35. Keymaster.cpp
  36. Keymaster.h
  37. KeyStorage.cpp
  38. KeyStorage.h
  39. KeyUtil.cpp
  40. KeyUtil.h
  41. Loop.cpp
  42. Loop.h
  43. main.cpp
  44. MetadataCrypt.cpp
  45. MetadataCrypt.h
  46. MoveStorage.cpp
  47. MoveStorage.h
  48. NetlinkHandler.cpp
  49. NetlinkHandler.h
  50. NetlinkManager.cpp
  51. NetlinkManager.h
  52. OWNERS
  53. PREUPLOAD.cfg
  54. Process.cpp
  55. Process.h
  56. ScryptParameters.cpp
  57. ScryptParameters.h
  58. secdiscard.cpp
  59. sehandle.h
  60. TEST_MAPPING
  61. Utils.cpp
  62. Utils.h
  63. vdc.cpp
  64. vdc.rc
  65. vold.rc
  66. vold_prepare_subdirs.cpp
  67. VoldNativeService.cpp
  68. VoldNativeService.h
  69. VoldNativeServiceValidation.cpp
  70. VoldNativeServiceValidation.h
  71. VoldUtil.cpp
  72. VoldUtil.h
  73. VolumeManager.cpp
  74. VolumeManager.h
  75. wait_for_keymaster.cpp
  76. wait_for_keymaster.rc