While dm-default-key no longer requires that the filesystem is also using inline encryption (i.e. mounted with '-o inlinecrypt'), it does still rely on the inline crypto hooks like fscrypt_set_bio_crypt_ctx() being built into the kernel rather than stubbed out, as these are used to set the bi_skip_dm_default_key flag on bios for encrypted files. I.e., CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y is still needed. The proper solution is to fix these hooks to handle DM_DEFAULT_KEY && !FS_ENCRYPTION_INLINE_CRYPT, but that would introduce a case that wouldn't get tested. So for now, to avoid problems just make dm-default-key depend on FS_ENCRYPTION_INLINE_CRYPT. Test: make gki_defconfig echo CONFIG_FS_ENCRYPTION_INLINE_CRYPT=n >> .config make olddefconfig grep CONFIG_DM_DEFAULT_KEY .config # was disabled Bug: 147814592 Change-Id: Ie52686a72d5d14457d87dcf81677e33e291680bb Signed-off-by: Eric Biggers <ebiggers@google.com>tirimbino
parent
a444cff8fe
commit
a9a545067a
Loading…
Reference in new issue