summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaptain Throwback <captainthrowback@hotmail.com>2016-05-17 17:25:52 +0200
committerCaptain Throwback <captainthrowback@hotmail.com>2016-05-17 20:26:43 +0200
commit35df638965e7e4f45cfed3f71e389b2e6a0ea9c0 (patch)
tree670fe0a40e08569d85a90b35397e6e8e8f2fa9bd
parentWait to mount until after fstab processed (diff)
downloadandroid_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.tar
android_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.tar.gz
android_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.tar.bz2
android_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.tar.lz
android_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.tar.xz
android_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.tar.zst
android_bootable_recovery-35df638965e7e4f45cfed3f71e389b2e6a0ea9c0.zip
-rw-r--r--crypto/lollipop/cryptfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c
index 774eb1740..0c7848d8f 100644
--- a/crypto/lollipop/cryptfs.c
+++ b/crypto/lollipop/cryptfs.c
@@ -928,6 +928,8 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr, const unsi
tgt->status = 0;
tgt->sector_start = 0;
tgt->length = crypt_ftr->fs_size;
+ crypt_params = buffer + sizeof(struct dm_ioctl) + sizeof(struct dm_target_spec);
+
#ifdef CONFIG_HW_DISK_ENCRYPTION
if(is_hw_disk_encryption((char*)crypt_ftr->crypto_type_name)) {
strlcpy(tgt->target_type, "req-crypt",DM_MAX_TYPE_NAME);
@@ -945,8 +947,6 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr, const unsi
strlcpy(tgt->target_type, "crypt", DM_MAX_TYPE_NAME);
#endif
- crypt_params = buffer + sizeof(struct dm_ioctl) + sizeof(struct dm_target_spec);
- convert_key_to_hex_ascii(master_key, crypt_ftr->keysize, master_key_ascii);
sprintf(crypt_params, "%s %s 0 %s 0 %s", crypt_ftr->crypto_type_name,
master_key_ascii, real_blk_name, extra_params);