Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 4ac43f0e163572d68313411ef734f364fb253f3a
commit4ac43f0e163572d68313411ef734f364fb253f3a[log] [tgz]
authorWill Shiu <Will.Shiu@mediatek.com>Wed Jul 29 17:03:17 2020 +0800
committerEric Biggers <ebiggers@google.com>Thu Aug 06 11:05:45 2020 -0700
treeb9055c95ff9150fd3454fe72cd19d8bb658bc075
parent5de675c93be181256ecc0361e885fa922693cfb8 [diff]
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
1 file changed
tree: b9055c95ff9150fd3454fe72cd19d8bb658bc075
  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. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. CryptoType.cpp
  19. CryptoType.h
  20. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. IdleMaint.cpp
  29. IdleMaint.h
  30. KeyBuffer.cpp
  31. KeyBuffer.h
  32. Keymaster.cpp
  33. Keymaster.h
  34. KeyStorage.cpp
  35. KeyStorage.h
  36. KeyUtil.cpp
  37. KeyUtil.h
  38. Loop.cpp
  39. Loop.h
  40. main.cpp
  41. MetadataCrypt.cpp
  42. MetadataCrypt.h
  43. MoveStorage.cpp
  44. MoveStorage.h
  45. NetlinkHandler.cpp
  46. NetlinkHandler.h
  47. NetlinkManager.cpp
  48. NetlinkManager.h
  49. OWNERS
  50. PREUPLOAD.cfg
  51. Process.cpp
  52. Process.h
  53. ScryptParameters.cpp
  54. ScryptParameters.h
  55. secdiscard.cpp
  56. sehandle.h
  57. Utils.cpp
  58. Utils.h
  59. vdc.cpp
  60. vdc.rc
  61. vold.rc
  62. vold_prepare_subdirs.cpp
  63. VoldNativeService.cpp
  64. VoldNativeService.h
  65. VoldNativeServiceValidation.cpp
  66. VoldNativeServiceValidation.h
  67. VoldUtil.cpp
  68. VoldUtil.h
  69. VolumeManager.cpp
  70. VolumeManager.h
  71. wait_for_keymaster.cpp
  72. wait_for_keymaster.rc