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

Commit 9b4c0567 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sm8150: Enable ICE metadata encryption"

parents bfd3d176 87a38fbd

arch/arm64/configs/vendor/sm8150-perf_defconfig

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

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y
@@ -649,6 +650,7 @@ CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0 
CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_PFK_WRAPPED_KEY_SUPPORTED=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

arch/arm64/configs/vendor/sm8150_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ CONFIG_SCSI_UFS_QCOM_ICE=y 
CONFIG_SCSI_UFSHCD_CMD_LOGGING=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y
@@ -729,6 +730,7 @@ CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0 
CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_PFK_WRAPPED_KEY_SUPPORTED=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

block/bio.c

+5 −1
Original line number Diff line number Diff line
@@ -580,8 +580,12 @@ EXPORT_SYMBOL(bio_phys_segments); 
static inline void bio_clone_crypt_key(struct bio *dst, const struct bio *src)

{

#ifdef CONFIG_PFK

	dst->bi_crypt_key = src->bi_crypt_key;

	dst->bi_iter.bi_dun = src->bi_iter.bi_dun;

#ifdef CONFIG_DM_DEFAULT_KEY

	dst->bi_crypt_key = src->bi_crypt_key;

	dst->bi_crypt_skip = src->bi_crypt_skip;

#endif

	dst->bi_dio_inode = src->bi_dio_inode;

#endif

}

drivers/md/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -286,6 +286,24 @@ config DM_CRYPT 


	  If unsure, say N.



config DM_DEFAULT_KEY

	tristate "Default-key crypt target support"

	depends on BLK_DEV_DM

	depends on PFK

	---help---

	  This (currently Android-specific) device-mapper target allows you to

	  create a device that assigns a default encryption key to bios that

	  don't already have one.  This can sit between inline cryptographic

	  acceleration hardware and filesystems that use it.  This ensures that

	  where the filesystem doesn't explicitly specify a key, such as for

	  filesystem metadata, a default key will be used instead, leaving no

	  sectors unencrypted.



	  To compile this code as a module, choose M here: the module will be

	  called dm-default-key.



	  If unsure, say N.



config DM_SNAPSHOT

       tristate "Snapshot target"

       depends on BLK_DEV_DM

drivers/md/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_BLK_DEV_DM_BUILTIN) += dm-builtin.o 
obj-$(CONFIG_DM_BUFIO)		+= dm-bufio.o

obj-$(CONFIG_DM_BIO_PRISON)	+= dm-bio-prison.o

obj-$(CONFIG_DM_CRYPT)		+= dm-crypt.o

obj-$(CONFIG_DM_DEFAULT_KEY)	+= dm-default-key.o

obj-$(CONFIG_DM_DELAY)		+= dm-delay.o

obj-$(CONFIG_DM_FLAKEY)		+= dm-flakey.o

obj-$(CONFIG_DM_MULTIPATH)	+= dm-multipath.o dm-round-robin.o