commit 455a04f76c9c18853e46d6db7f8fe6e352670262
author Paul Lawrence <paullawrence@google.com> Mon Sep 08 20:21:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 08 20:21:04 2014 +0000
tree 6c7aec53e69692877229da69e9037334a793b8b9
parent 6e164ea4a14fbaf7350b38cea288a603c05c0fbf
parent b2f682bda8443fb93ab67f19be84fd80d5ed2838

am b2f682bd: Fix Shamus bricked by encryption upgrade

* commit 'b2f682bda8443fb93ab67f19be84fd80d5ed2838':
  Fix Shamus bricked by encryption upgrade

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index b729616..563acbc 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1788,6 +1788,17 @@
             rc = put_crypt_ftr_and_key(crypt_ftr);
         }
         SLOGD("Key Derivation Function upgrade: rc=%d\n", rc);
+
+        // Do not fail even if upgrade failed - machine is bootable
+        // Note that if this code is ever hit, there is a *serious* problem
+        // since KDFs should never fail. You *must* fix the kdf before
+        // proceeding!
+        if (rc) {
+          SLOGW("Upgrade failed with error %d,"
+                " but continuing with previous state",
+                rc);
+          rc = 0;
+        }
     }
   }