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

Commit 7889027f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable dm-default-key and dm-crypt"

parents 62ea0b2a e04a3f1b

arch/arm64/configs/vendor/kona-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ CONFIG_SCSI_UFS_QCOM=y 
CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y

arch/arm64/configs/vendor/kona_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ CONFIG_SCSI_UFS_QCOM=y 
CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y

drivers/md/dm-default-key.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int default_key_map(struct dm_target *ti, struct bio *bio) 
			dm_target_offset(ti, bio->bi_iter.bi_sector);

	}



	if (!bio->bi_crypt_key)

	if (!bio->bi_crypt_key && !bio->bi_crypt_skip)

		bio->bi_crypt_key = &dkc->key;



	return DM_MAPIO_REMAPPED;