Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / 3a2f7db477288c181c5450a22e089dd2dbaf637c
commit3a2f7db477288c181c5450a22e089dd2dbaf637c[log] [tgz]
authorEric Biggers <ebiggers@google.com>Wed Jan 16 13:05:34 2019 -0800
committerEric Biggers <ebiggers@google.com>Fri Jan 18 13:26:08 2019 -0800
tree3c5bb2d55ada1d1e5f15f4e9ba470928885f26b2
parent0ef7bfd59c0a97b39b2e1152da30db4e96e3a915 [diff]
cryptfs: check for errors in create_encrypted_random_key()

When generating the key and salt we weren't checking for an error
opening or reading from /dev/urandom.  Switch to the helper function
ReadRandomBytes() and start checking for errors.

Test: Booted device with FDE.  As a extra sanity check I also
      temporarily added log messages that dump the key and salt,
      and I verified they still appear random.
Change-Id: I01ccee4f1f9910bf9508c8f02a918157393b0e68
1 file changed
tree: 3c5bb2d55ada1d1e5f15f4e9ba470928885f26b2
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .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. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. hash.h
  29. IdleMaint.cpp
  30. IdleMaint.h
  31. KeyBuffer.cpp
  32. KeyBuffer.h
  33. Keymaster.cpp
  34. Keymaster.h
  35. KeyStorage.cpp
  36. KeyStorage.h
  37. KeyUtil.cpp
  38. KeyUtil.h
  39. Loop.cpp
  40. Loop.h
  41. main.cpp
  42. MetadataCrypt.cpp
  43. MetadataCrypt.h
  44. MoveStorage.cpp
  45. MoveStorage.h
  46. NetlinkHandler.cpp
  47. NetlinkHandler.h
  48. NetlinkManager.cpp
  49. NetlinkManager.h
  50. OWNERS
  51. PREUPLOAD.cfg
  52. Process.cpp
  53. Process.h
  54. ScryptParameters.cpp
  55. ScryptParameters.h
  56. secdiscard.cpp
  57. secontext.cpp
  58. secontext.h
  59. sehandle.h
  60. Utils.cpp
  61. Utils.h
  62. vdc.cpp
  63. vdc.rc
  64. vold.rc
  65. vold_prepare_subdirs.cpp
  66. VoldNativeService.cpp
  67. VoldNativeService.h
  68. VoldUtil.cpp
  69. VoldUtil.h
  70. VolumeManager.cpp
  71. VolumeManager.h
  72. wait_for_keymaster.cpp
  73. wait_for_keymaster.rc