openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ANDROID: block: initialize the bi_skip_dm_default_key field 

Due to upstream commit da521626ac ("bio: optimize initialization of a
bio"), the bi_skip_dm_default_key field is no longer being initialized,
which breaks dm-default-key.  Make bio_init() initialize it.

This should be folded into
ANDROID-dm-add-dm-default-key-target-for-metadata-encryption.patch.

Bug: 160885805
Reported-by: John Stultz <john.stultz@linaro.org>
Fixes: dc39b05494 ("Merge 916d636e0a ("Merge tag 'vfs-5.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux") into android-mainline")
Change-Id: I79310f63e38497db7953c50b3e90013aa6679d31
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2021-09-08 16:50:51 -07:00 committed by Greg Kroah-Hartman
parent e1fc7698ca
commit 8607779ccb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/bio.c
View File

@ -273,6 +273,9 @@ void bio_init(struct bio *bio, struct bio_vec *table,
#endif
#ifdef CONFIG_BLK_INLINE_ENCRYPTION
bio->bi_crypt_context = NULL;
#if IS_ENABLED(CONFIG_DM_DEFAULT_KEY)
bio->bi_skip_dm_default_key = false;
#endif
#endif
#ifdef CONFIG_BLK_DEV_INTEGRITY
bio->bi_integrity = NULL;