Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / vold / 933216c8861b6b3f0e65cd27812ce2e3c26721c4
commit933216c8861b6b3f0e65cd27812ce2e3c26721c4[log] [tgz]
authorJP Abgrall <jpa@google.com>Wed Feb 11 13:44:32 2015 -0800
committerJP Abgrall <jpa@google.com>Wed Feb 11 13:44:32 2015 -0800
treed39889f24469054d890e4d70e01e7cd5ebb6791e
parentd32b75e6dc329fc8b15d0ae48cf932f091ed6299 [diff]
crytpfs: fix clobbering of crypto info on keymaster failure

Changing the device lock (even from swipe to none) will cause the
master key to be re-encrypted.
If at that point keymaster fails (e.g. due to an incompatible keymaster update)
cryptfs will write back the now-incomplete crypto metadata.
Upon next reboot, userdata can't be decrypted.

Now we don't bother writing on keymaster failure.

Bug: 19301883
Change-Id: I2b9a1278f8b4d333ac8d567e17e2263005e99409
1 file changed
tree: d39889f24469054d890e4d70e01e7cd5ebb6791e
  1. tests/
  2. Android.mk
  3. Asec.h
  4. CheckBattery.cpp
  5. CheckBattery.h
  6. CleanSpec.mk
  7. CommandListener.cpp
  8. CommandListener.h
  9. cryptfs.c
  10. cryptfs.h
  11. Devmapper.cpp
  12. Devmapper.h
  13. DirectVolume.cpp
  14. DirectVolume.h
  15. Ext4.cpp
  16. Ext4.h
  17. Fat.cpp
  18. Fat.h
  19. fstrim.c
  20. fstrim.h
  21. hash.h
  22. Loop.cpp
  23. Loop.h
  24. main.cpp
  25. NetlinkHandler.cpp
  26. NetlinkHandler.h
  27. NetlinkManager.cpp
  28. NetlinkManager.h
  29. Process.cpp
  30. Process.h
  31. ResponseCode.cpp
  32. ResponseCode.h
  33. sehandle.h
  34. vdc.c
  35. VoldCommand.cpp
  36. VoldCommand.h
  37. VoldUtil.c
  38. VoldUtil.h
  39. Volume.cpp
  40. Volume.h
  41. VolumeManager.cpp
  42. VolumeManager.h