tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove all references to FDE enable wipe

Browse source 
Bug: 64766105
Test: FBE boots, forceencrypt boots, set pattern, reboots, encryptable
      boots and can be encrypted
Change-Id: I8c6dc0acdc37c3a6f1bea28d5607ed8938a4eb0c
This commit is contained in:
Paul Lawrence 2017-12-22 10:12:06 -08:00
parent 91f1886e14
commit 7ee87cfcbe
6 changed files with 55 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
VoldNativeService.cpp
View file

@ -554,22 +554,12 @@ static int fdeEnableInternal(int32_t passwordType, const std::string& password,
int32_t encryptionFlags) { int32_t encryptionFlags) {
bool noUi = (encryptionFlags & VoldNativeService::ENCRYPTION_FLAG_NO_UI) != 0; bool noUi = (encryptionFlags & VoldNativeService::ENCRYPTION_FLAG_NO_UI) != 0;
std::string how;
if ((encryptionFlags & VoldNativeService::ENCRYPTION_FLAG_IN_PLACE) != 0) {
how = "inplace";
} else if ((encryptionFlags & VoldNativeService::ENCRYPTION_FLAG_WIPE) != 0) {
how = "wipe";
} else {
LOG(ERROR) << "Missing encryption flag";
return -1;
}
for (int tries = 0; tries < 2; ++tries) { for (int tries = 0; tries < 2; ++tries) {
int rc; int rc;
if (passwordType == VoldNativeService::PASSWORD_TYPE_DEFAULT) { if (passwordType == VoldNativeService::PASSWORD_TYPE_DEFAULT) {
rc = cryptfs_enable_default(how.c_str(), noUi); rc = cryptfs_enable_default(noUi);
} else { } else {
rc = cryptfs_enable(how.c_str(), passwordType, password.c_str(), noUi); rc = cryptfs_enable(passwordType, password.c_str(), noUi);
} }
if (rc == 0) { if (rc == 0) {
@ -591,9 +581,6 @@ binder::Status VoldNativeService::fdeEnable(int32_t passwordType,
if (passwordType != PASSWORD_TYPE_DEFAULT) { if (passwordType != PASSWORD_TYPE_DEFAULT) {
return error("Unexpected password type"); return error("Unexpected password type");
} }
if (encryptionFlags != (ENCRYPTION_FLAG_IN_PLACE | ENCRYPTION_FLAG_NO_UI)) {
return error("Unexpected flags");
}
return translateBool(e4crypt_enable_crypto()); return translateBool(e4crypt_enable_crypto());
} }

2
binder/android/os/IVold.aidl
View file

@ -94,8 +94,6 @@ interface IVold {
void secdiscard(@utf8InCpp String path); void secdiscard(@utf8InCpp String path);
const int ENCRYPTION_FLAG_WIPE = 1;
const int ENCRYPTION_FLAG_IN_PLACE = 2;
const int ENCRYPTION_FLAG_NO_UI = 4; const int ENCRYPTION_FLAG_NO_UI = 4;
const int ENCRYPTION_STATE_NONE = 1; const int ENCRYPTION_STATE_NONE = 1;

150
cryptfs.cpp
View file

@ -1925,73 +1925,6 @@ static int cryptfs_init_crypt_mnt_ftr(struct crypt_mnt_ftr *ftr)
return 0; return 0;
} }
static int cryptfs_enable_wipe(char *crypto_blkdev, off64_t size, int type)
{
const char *args[10];
char size_str[32]; /* Must be large enough to hold a %lld and null byte */
int num_args;
int status;
int tmp;
int rc = -1;
if (type == EXT4_FS) {
args[0] = "/system/bin/mke2fs";
args[1] = "-M";
args[2] = "/data";
args[3] = "-b";
args[4] = "4096";
args[5] = "-t";
args[6] = "ext4";
args[7] = crypto_blkdev;
snprintf(size_str, sizeof(size_str), "%" PRId64, size / (4096 / 512));
args[8] = size_str;
num_args = 9;
SLOGI("Making empty filesystem with command %s %s %s %s %s %s\n",
args[0], args[1], args[2], args[3], args[4], args[5]);
} else if (type == F2FS_FS) {
args[0] = "/system/bin/make_f2fs";
args[1] = "-f";
args[2] = "-d1";
args[3] = "-O";
args[4] = "encrypt";
args[5] = "-O";
args[6] = "quota";
args[7] = crypto_blkdev;
snprintf(size_str, sizeof(size_str), "%" PRId64, size);
args[8] = size_str;
num_args = 9;
SLOGI("Making empty filesystem with command %s %s %s %s %s %s %s %s %s\n",
args[0], args[1], args[2], args[3], args[4], args[5],
args[6], args[7], args[8]);
} else {
SLOGE("cryptfs_enable_wipe(): unknown filesystem type %d\n", type);
return -1;
}
tmp = android_fork_execvp(num_args, (char **)args, &status, false, true);
if (tmp != 0) {
SLOGE("Error creating empty filesystem on %s due to logwrap error\n", crypto_blkdev);
} else {
if (WIFEXITED(status)) {
if (WEXITSTATUS(status)) {
SLOGE("Error creating filesystem on %s, exit status %d ",
crypto_blkdev, WEXITSTATUS(status));
} else {
SLOGD("Successfully created filesystem on %s\n", crypto_blkdev);
rc = 0;
}
} else {
SLOGE("Error creating filesystem on %s, did not exit normally\n", crypto_blkdev);
}
}
return rc;
}
#define CRYPTO_ENABLE_WIPE 1
#define CRYPTO_ENABLE_INPLACE 2
#define FRAMEWORK_BOOT_WAIT 60 #define FRAMEWORK_BOOT_WAIT 60
static int cryptfs_SHA256_fileblock(const char* filename, __le8* buf) static int cryptfs_SHA256_fileblock(const char* filename, __le8* buf)
@ -2020,40 +1953,16 @@ static int cryptfs_SHA256_fileblock(const char* filename, __le8* buf)
return 0; return 0;
} }
static int get_fs_type(struct fstab_rec *rec) static int cryptfs_enable_all_volumes(struct crypt_mnt_ftr* crypt_ftr, char* crypto_blkdev,
{ char* real_blkdev, int previously_encrypted_upto) {
if (!strcmp(rec->fs_type, "ext4")) {
return EXT4_FS;
} else if (!strcmp(rec->fs_type, "f2fs")) {
return F2FS_FS;
} else {
return -1;
}
}
static int cryptfs_enable_all_volumes(struct crypt_mnt_ftr *crypt_ftr, int how,
char *crypto_blkdev, char *real_blkdev,
int previously_encrypted_upto)
{
off64_t cur_encryption_done=0, tot_encryption_size=0; off64_t cur_encryption_done=0, tot_encryption_size=0;
int rc = -1; int rc = -1;
/* The size of the userdata partition, and add in the vold volumes below */ /* The size of the userdata partition, and add in the vold volumes below */
tot_encryption_size = crypt_ftr->fs_size; tot_encryption_size = crypt_ftr->fs_size;
if (how == CRYPTO_ENABLE_WIPE) { rc = cryptfs_enable_inplace(crypto_blkdev, real_blkdev, crypt_ftr->fs_size, &cur_encryption_done,
struct fstab_rec* rec = fs_mgr_get_entry_for_mount_point(fstab_default, DATA_MNT_POINT); tot_encryption_size, previously_encrypted_upto);
int fs_type = get_fs_type(rec);
if (fs_type < 0) {
SLOGE("cryptfs_enable: unsupported fs type %s\n", rec->fs_type);
return -1;
}
rc = cryptfs_enable_wipe(crypto_blkdev, crypt_ftr->fs_size, fs_type);
} else if (how == CRYPTO_ENABLE_INPLACE) {
rc = cryptfs_enable_inplace(crypto_blkdev, real_blkdev,
crypt_ftr->fs_size, &cur_encryption_done,
tot_encryption_size,
previously_encrypted_upto);
if (rc == ENABLE_INPLACE_ERR_DEV) { if (rc == ENABLE_INPLACE_ERR_DEV) {
/* Hack for b/17898962 */ /* Hack for b/17898962 */
@ -2070,11 +1979,6 @@ static int cryptfs_enable_all_volumes(struct crypt_mnt_ftr *crypt_ftr, int how,
* to the round down nature of integer division, so set it here */ * to the round down nature of integer division, so set it here */
property_set("vold.encrypt_progress", "100"); property_set("vold.encrypt_progress", "100");
} }
} else {
/* Shouldn't happen */
SLOGE("cryptfs_enable: internal error, unknown option\n");
rc = -1;
}
return rc; return rc;
} }
@ -2084,10 +1988,7 @@ static int vold_unmountAll(void) {
return vm->unmountAll(); return vm->unmountAll();
} }
int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *passwd, int cryptfs_enable_internal(int crypt_type, const char* passwd, int no_ui) {
int no_ui)
{
int how = 0;
char crypto_blkdev[MAXPATHLEN], real_blkdev[MAXPATHLEN]; char crypto_blkdev[MAXPATHLEN], real_blkdev[MAXPATHLEN];
unsigned char decrypted_master_key[KEY_LEN_BYTES]; unsigned char decrypted_master_key[KEY_LEN_BYTES];
int rc=-1, i; int rc=-1, i;
@ -2102,17 +2003,7 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
bool onlyCreateHeader = false; bool onlyCreateHeader = false;
int fd = -1; int fd = -1;
if (!strcmp(howarg, "wipe")) { if (get_crypt_ftr_and_key(&crypt_ftr) == 0) {
how = CRYPTO_ENABLE_WIPE;
} else if (! strcmp(howarg, "inplace")) {
how = CRYPTO_ENABLE_INPLACE;
} else {
/* Shouldn't happen, as CommandListener vets the args */
goto error_unencrypted;
}
if (how == CRYPTO_ENABLE_INPLACE
&& get_crypt_ftr_and_key(&crypt_ftr) == 0) {
if (crypt_ftr.flags & CRYPT_ENCRYPTION_IN_PROGRESS) { if (crypt_ftr.flags & CRYPT_ENCRYPTION_IN_PROGRESS) {
/* An encryption was underway and was interrupted */ /* An encryption was underway and was interrupted */
previously_encrypted_upto = crypt_ftr.encrypted_upto; previously_encrypted_upto = crypt_ftr.encrypted_upto;
@ -2165,7 +2056,7 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
close(fd); close(fd);
/* If doing inplace encryption, make sure the orig fs doesn't include the crypto footer */ /* If doing inplace encryption, make sure the orig fs doesn't include the crypto footer */
if ((how == CRYPTO_ENABLE_INPLACE) && (!strcmp(key_loc, KEY_IN_FOOTER))) { if (!strcmp(key_loc, KEY_IN_FOOTER)) {
unsigned int fs_size_sec, max_fs_size_sec; unsigned int fs_size_sec, max_fs_size_sec;
fs_size_sec = get_fs_size(real_blkdev); fs_size_sec = get_fs_size(real_blkdev);
if (fs_size_sec == 0) if (fs_size_sec == 0)
@ -2212,7 +2103,7 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
} }
/* Do extra work for a better UX when doing the long inplace encryption */ /* Do extra work for a better UX when doing the long inplace encryption */
if (how == CRYPTO_ENABLE_INPLACE && !onlyCreateHeader) { if (!onlyCreateHeader) {
/* Now that /data is unmounted, we need to mount a tmpfs /* Now that /data is unmounted, we need to mount a tmpfs
* /data, set a property saying we're doing inplace encryption, * /data, set a property saying we're doing inplace encryption,
* and restart the framework. * and restart the framework.
@ -2299,7 +2190,7 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
cryptfs_reboot(RebootType::reboot); cryptfs_reboot(RebootType::reboot);
} }
if (how == CRYPTO_ENABLE_INPLACE && (!no_ui || rebootEncryption)) { if (!no_ui || rebootEncryption) {
/* startup service classes main and late_start */ /* startup service classes main and late_start */
property_set("vold.decrypt", "trigger_restart_min_framework"); property_set("vold.decrypt", "trigger_restart_min_framework");
SLOGD("Just triggered restart_min_framework\n"); SLOGD("Just triggered restart_min_framework\n");
@ -2329,14 +2220,12 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
} }
if (!rc) { if (!rc) {
rc = cryptfs_enable_all_volumes(&crypt_ftr, how, rc = cryptfs_enable_all_volumes(&crypt_ftr, crypto_blkdev, real_blkdev,
crypto_blkdev, real_blkdev,
previously_encrypted_upto); previously_encrypted_upto);
} }
/* Calculate checksum if we are not finished */ /* Calculate checksum if we are not finished */
if (!rc && how == CRYPTO_ENABLE_INPLACE if (!rc && crypt_ftr.encrypted_upto != crypt_ftr.fs_size) {
&& crypt_ftr.encrypted_upto != crypt_ftr.fs_size) {
rc = cryptfs_SHA256_fileblock(crypto_blkdev, rc = cryptfs_SHA256_fileblock(crypto_blkdev,
crypt_ftr.hash_first_block); crypt_ftr.hash_first_block);
if (rc) { if (rc) {
@ -2352,8 +2241,7 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
/* Success */ /* Success */
crypt_ftr.flags &= ~CRYPT_INCONSISTENT_STATE; crypt_ftr.flags &= ~CRYPT_INCONSISTENT_STATE;
if (how == CRYPTO_ENABLE_INPLACE if (crypt_ftr.encrypted_upto != crypt_ftr.fs_size) {
&& crypt_ftr.encrypted_upto != crypt_ftr.fs_size) {
SLOGD("Encrypted up to sector %lld - will continue after reboot", SLOGD("Encrypted up to sector %lld - will continue after reboot",
crypt_ftr.encrypted_upto); crypt_ftr.encrypted_upto);
crypt_ftr.flags |= CRYPT_ENCRYPTION_IN_PROGRESS; crypt_ftr.flags |= CRYPT_ENCRYPTION_IN_PROGRESS;
@ -2361,8 +2249,7 @@ int cryptfs_enable_internal(const char *howarg, int crypt_type, const char *pass
put_crypt_ftr_and_key(&crypt_ftr); put_crypt_ftr_and_key(&crypt_ftr);
if (how == CRYPTO_ENABLE_WIPE if (crypt_ftr.encrypted_upto == crypt_ftr.fs_size) {
|| crypt_ftr.encrypted_upto == crypt_ftr.fs_size) {
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];
property_get("ro.crypto.state", value, ""); property_get("ro.crypto.state", value, "");
if (!strcmp(value, "")) { if (!strcmp(value, "")) {
@ -2443,15 +2330,12 @@ error_shutting_down:
return -1; return -1;
} }
int cryptfs_enable(const char *howarg, int type, const char *passwd, int no_ui) int cryptfs_enable(int type, const char* passwd, int no_ui) {
{ return cryptfs_enable_internal(type, passwd, no_ui);
return cryptfs_enable_internal(howarg, type, passwd, no_ui);
} }
int cryptfs_enable_default(const char *howarg, int no_ui) int cryptfs_enable_default(int no_ui) {
{ return cryptfs_enable_internal(CRYPT_TYPE_DEFAULT, DEFAULT_PASSWORD, no_ui);
return cryptfs_enable_internal(howarg, CRYPT_TYPE_DEFAULT,
DEFAULT_PASSWORD, no_ui);
} }
int cryptfs_changepw(int crypt_type, const char *newpw) int cryptfs_changepw(int crypt_type, const char *newpw)

4
cryptfs.h
View file

@ -231,9 +231,9 @@ int cryptfs_crypto_complete(void);
int cryptfs_check_passwd(const char* pw); int cryptfs_check_passwd(const char* pw);
int cryptfs_verify_passwd(const char* pw); int cryptfs_verify_passwd(const char* pw);
int cryptfs_restart(void); int cryptfs_restart(void);
int cryptfs_enable(const char* flag, int type, const char* passwd, int no_ui); int cryptfs_enable(int type, const char* passwd, int no_ui);
int cryptfs_changepw(int type, const char* newpw); int cryptfs_changepw(int type, const char* newpw);
int cryptfs_enable_default(const char* flag, int no_ui); int cryptfs_enable_default(int no_ui);
int cryptfs_setup_ext_volume(const char* label, const char* real_blkdev, const unsigned char* key, int cryptfs_setup_ext_volume(const char* label, const char* real_blkdev, const unsigned char* key,
int keysize, char* out_crypto_blkdev); int keysize, char* out_crypto_blkdev);
int cryptfs_revert_ext_volume(const char* label); int cryptfs_revert_ext_volume(const char* label);

3
vdc.cpp
View file

@ -93,8 +93,7 @@ int main(int argc, char** argv) {
checkStatus(vold->initUser0()); checkStatus(vold->initUser0());
} else if (args[0] == "cryptfs" && args[1] == "enablecrypto") { } else if (args[0] == "cryptfs" && args[1] == "enablecrypto") {
int passwordType = android::os::IVold::PASSWORD_TYPE_DEFAULT; int passwordType = android::os::IVold::PASSWORD_TYPE_DEFAULT;
int encryptionFlags = android::os::IVold::ENCRYPTION_FLAG_IN_PLACE int encryptionFlags = android::os::IVold::ENCRYPTION_FLAG_NO_UI;
| android::os::IVold::ENCRYPTION_FLAG_NO_UI;
checkStatus(vold->fdeEnable(passwordType, "", encryptionFlags)); checkStatus(vold->fdeEnable(passwordType, "", encryptionFlags));
} else if (args[0] == "cryptfs" && args[1] == "mountdefaultencrypted") { } else if (args[0] == "cryptfs" && args[1] == "mountdefaultencrypted") {
checkStatus(vold->mountDefaultEncrypted()); checkStatus(vold->mountDefaultEncrypted());

2
vdc.rc
View file

@ -7,6 +7,6 @@ on defaultcrypto
# One shot invocation to encrypt unencrypted volumes # One shot invocation to encrypt unencrypted volumes
on encrypt on encrypt
start surfaceflinger start surfaceflinger
exec - root -- /system/bin/vdc --wait cryptfs enablecrypto inplace default noui exec - root -- /system/bin/vdc --wait cryptfs enablecrypto
# vold will set vold.decrypt to trigger_restart_framework (default # vold will set vold.decrypt to trigger_restart_framework (default
# encryption) # encryption)