Gitiles
Code Review Sign In
review.blissroms.org / platform_system_keymaster / cbb26fa796506f721d7e6a5e40b6c57ba66facfe
commitcbb26fa796506f721d7e6a5e40b6c57ba66facfe[log] [tgz]
authorShawn Willden <swillden@google.com>Fri Dec 05 15:22:02 2014 -0700
committerShawn Willden <swillden@google.com>Mon Dec 08 07:57:46 2014 -0700
tree7e24a165b91ad45d53e09be78d8b2b599b40c043
parent5e0579c2d4437b6f3c03872a643d12cb08a7bc79 [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.

Change-Id: I2edc12f974a40c6232539954e0c28b181e1ce319
1 file changed
tree: 7e24a165b91ad45d53e09be78d8b2b599b40c043
  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