diff options
| author | Neeraj Soni <neersoni@codeaurora.org> | 2019-03-11 19:45:51 +0530 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2019-12-14 19:07:02 -0500 |
| commit | a8847c8f5655ec9eb9179e28b317f7d4cb5a6f18 (patch) | |
| tree | 1b8d48bf67ea4ad87b0e043699f991564cdb4e89 /cryptfs.cpp | |
| parent | 039848d4a28173c6f8b97792441ad7b68211cc5b (diff) | |
system: vold: pass proper extra params to load crypto device
Device mapper needs proper format of argument passed to load
the crypto table to serve block IO request.
CRs-Fixed: 2406004
Change-Id: I7889fb5019c34be453a2749b8c00179acfba6e6b
Diffstat (limited to 'cryptfs.cpp')
| -rw-r--r-- | cryptfs.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cryptfs.cpp b/cryptfs.cpp index ebd64dc..b244158 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp @@ -1342,15 +1342,14 @@ static int create_crypto_blk_dev(struct crypt_mnt_ftr* crypt_ftr, const unsigned else extra_params = "fde_enabled"; } + extra_params_vec.emplace_back(extra_params); } else { - extra_params = ""; if (! get_dm_crypt_version(fd, name, version)) { /* Support for allow_discards was added in version 1.11.0 */ if ((version[0] >= 2) || ((version[0] == 1) && (version[1] >= 11))) { + extra_params_vec.emplace_back("allow_discards"); if (flags & CREATE_CRYPTO_BLK_DEV_FLAGS_ALLOW_ENCRYPT_OVERRIDE) - extra_params = "2 allow_discards allow_encrypt_override"; - else - extra_params = "1 allow_discards"; + extra_params_vec.emplace_back("allow_encrypt_override"); SLOGI("Enabling support for allow_discards in dmcrypt.\n"); } } |