Gitiles
Code Review Sign In
review.blissroms.org / platform_system_keymaster / 169b3aaca14268a6ab36e19b1cffb47f638ee506
commit169b3aaca14268a6ab36e19b1cffb47f638ee506[log] [tgz]
authorShawn Willden <swillden@google.com>Fri Dec 05 15:22:02 2014 -0700
committerShawn Willden <swillden@google.com>Thu Jan 22 16:35:35 2015 -0700
tree99118a5223e86535934c63f270603101745edb77
parent628352b4210e26a6ea1db3f508274d93ab16616f [diff]
Fix heap-smashing bug in keymaster key encryption.

If ae_init ever fails, the memset intended to clean up the OCB key
structure would actually zero a good chunk of random heap space because
zeros from the address of the pointer to the key structure, rather than
the address of the key structure.  This fixes it.

This change was already reviewed, merged and reverted, so I'm skipping
the review step this time.

Change-Id: If165f5583c588b695725f7c30f6d54d7805ba9dc
1 file changed
tree: 99118a5223e86535934c63f270603101745edb77
  1. include/
  2. .clang-format
  3. .gitignore
  4. ae.h
  5. aes_key.cpp
  6. aes_key.h
  7. Android.mk
  8. asymmetric_key.cpp
  9. asymmetric_key.h
  10. authorization_set.cpp
  11. authorization_set_test.cpp
  12. ec_privkey_pk8.der
  13. ecdsa_key.cpp
  14. ecdsa_key.h
  15. ecdsa_operation.cpp
  16. ecdsa_operation.h
  17. google_keymaster.cpp
  18. google_keymaster_messages.cpp
  19. google_keymaster_messages_test.cpp
  20. google_keymaster_test.cpp
  21. google_keymaster_test_utils.cpp
  22. google_keymaster_test_utils.h
  23. google_keymaster_utils.cpp
  24. google_softkeymaster.h
  25. key.cpp
  26. key.h
  27. key_blob.cpp
  28. key_blob_test.cpp
  29. Makefile
  30. ocb.c
  31. openssl_utils.h
  32. operation.h
  33. rsa_key.cpp
  34. rsa_key.h
  35. rsa_operation.cpp
  36. rsa_operation.h
  37. rsa_privkey_pk8.der
  38. serializable.cpp
  39. unencrypted_key_blob.cpp
  40. unencrypted_key_blob.h