commit 6bcac81e6a8db504dc32d89907f847b5a9118817
author Paul Lawrence <paullawrence@google.com> Sun Oct 05 23:27:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 05 23:27:41 2014 +0000
tree 36362b6a2f80f7e7d0150d02676c711c67deaac5
parent b69a5e44db9b7ecf39b9441115f3470554062157
parent 7639a6ab60426bbfa57c750c1ff0b4016cad0294

am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev

* commit '7639a6ab60426bbfa57c750c1ff0b4016cad0294':
  Reset failed decryption count on successful decryptions

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index e3d8ad4..e9c6da0 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1799,6 +1799,9 @@
 
   if (rc == 0) {
     crypt_ftr->failed_decrypt_count = 0;
+    if (orig_failed_decrypt_count != 0) {
+      put_crypt_ftr_and_key(crypt_ftr);
+    }
 
     /* Save the name of the crypto block device
      * so we can mount it when restarting the framework. */