| commit | 7639a6ab60426bbfa57c750c1ff0b4016cad0294 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Sun Oct 05 23:24:46 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Oct 05 23:24:46 2014 +0000 |
| tree | db229754783efd74bcd570d46c0395ff800c15df | |
| parent | 6e8440fd5072a673dd861ffb531fc17b4673ad90 [diff] | |
| parent | 72b8b82780c062f48350d743c5ee43ced369507d [diff] |
Merge "Reset failed decryption count on successful decryptions" into lmp-dev
diff --git a/cryptfs.c b/cryptfs.c index 606b9f1..ec565c8 100644 --- a/cryptfs.c +++ b/cryptfs.c
@@ -1797,6 +1797,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. */