Add support for wiping data immediately if crypt fails

Needed for headless devices that need to recover with no user intervention

Bug: 5556856

Change-Id: I0f85591df513a6893324fb057bde114ac1df044b
Signed-off-by: Mike Lockwood <lockwood@google.com>
This commit is contained in:
Mike Lockwood 2012-02-15 13:43:28 -08:00
parent 8c4873319a
commit ee6d8c42f3

View file

@ -40,6 +40,7 @@
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include "cryptfs.h" #include "cryptfs.h"
#define LOG_TAG "Cryptfs" #define LOG_TAG "Cryptfs"
#include "cutils/android_reboot.h"
#include "cutils/log.h" #include "cutils/log.h"
#include "cutils/properties.h" #include "cutils/properties.h"
#include "hardware_legacy/power.h" #include "hardware_legacy/power.h"
@ -1372,8 +1373,26 @@ int cryptfs_enable(char *howarg, char *passwd)
sleep(2); /* Give the UI a chance to show 100% progress */ sleep(2); /* Give the UI a chance to show 100% progress */
android_reboot(ANDROID_RB_RESTART, 0, 0); android_reboot(ANDROID_RB_RESTART, 0, 0);
} else { } else {
property_set("vold.encrypt_progress", "error_partially_encrypted"); char value[PROPERTY_VALUE_MAX];
release_wake_lock(lockid);
property_get("ro.vold.wipe_on_cyrypt_fail", value, "0");
if (!strcmp(value, "1")) {
/* wipe data if encryption failed */
SLOGE("encryption failed - rebooting into recovery to wipe data\n");
mkdir("/cache/recovery", 0700);
int fd = open("/cache/recovery/command", O_RDWR|O_CREAT|O_TRUNC);
if (fd >= 0) {
write(fd, "--wipe_data", strlen("--wipe_data") + 1);
close(fd);
} else {
SLOGE("could not open /cache/recovery/command\n");
}
android_reboot(ANDROID_RB_RESTART2, 0, "recovery");
} else {
/* set property to trigger dialog */
property_set("vold.encrypt_progress", "error_partially_encrypted");
release_wake_lock(lockid);
}
return -1; return -1;
} }