Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c739c011 authored by Gaurav Kashyap's avatar Gaurav Kashyap Committed by Eric Biggers
Browse files

ANDROID: dm-default-key: Update key size for wrapped keys 



Wrapped keys can have key sizes of variable length.
Pass in the wrapped key size sent from userspace instead
of using a fixed value from the cipher when calling into
blk-crypto.

Bug: 156230001

Test: Validated metadata encryption with wrappedkey_v0 when /data
      is mounted on a dm device.
      fstab: metadata_encryption=aes-256-xts:wrappedkey_v0

Change-Id: I0ad1f2ced57c6b2b34f6e55942eba2e1c2c030b1
Signed-off-by: default avatarGaurav Kashyap <gaurkash@codeaurora.org>
parent afad9112

drivers/md/dm-default-key.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int default_key_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad;

	}



	err = blk_crypto_init_key(&dkc->key, raw_key, cipher->key_size,

	err = blk_crypto_init_key(&dkc->key, raw_key, raw_key_size,

				  dkc->is_hw_wrapped, cipher->mode_num,

				  dkc->sector_size);

	if (err) {