Commit 231af470 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Kees Cook
Browse files

dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation 



The verity glue for LoadPin is only needed when CONFIG_SECURITY_LOADPIN_VERITY
is set, use this option for conditional compilation instead of the combo of
CONFIG_DM_VERITY and CONFIG_SECURITY_LOADPIN.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Acked-by: default avatarMike Snitzer <snitzer@kernel.org>
Link: https://lore.kernel.org/lkml/20220627083512.v7.3.I5aca2dcc3b06de4bf53696cd21329dce8272b8aa@changeid


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 3f805f8c

drivers/md/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ obj-$(CONFIG_DM_LOG_WRITES) += dm-log-writes.o 
obj-$(CONFIG_DM_INTEGRITY)	+= dm-integrity.o

obj-$(CONFIG_DM_ZONED)		+= dm-zoned.o

obj-$(CONFIG_DM_WRITECACHE)	+= dm-writecache.o

obj-$(CONFIG_SECURITY_LOADPIN_VERITY)	+= dm-verity-loadpin.o



ifeq ($(CONFIG_DM_INIT),y)

dm-mod-objs			+= dm-init.o
@@ -108,12 +109,6 @@ ifeq ($(CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG),y) 
dm-verity-objs			+= dm-verity-verify-sig.o

endif



ifeq ($(CONFIG_DM_VERITY),y)

ifeq ($(CONFIG_SECURITY_LOADPIN),y)

dm-verity-objs			+= dm-verity-loadpin.o

endif

endif



ifeq ($(CONFIG_DM_AUDIT),y)

dm-mod-objs			+= dm-audit.o

endif

include/linux/dm-verity-loadpin.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct dm_verity_loadpin_trusted_root_digest { 
	u8 data[];

};



#if IS_ENABLED(CONFIG_SECURITY_LOADPIN) && IS_BUILTIN(CONFIG_DM_VERITY)

#if IS_ENABLED(CONFIG_SECURITY_LOADPIN_VERITY)

bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev);

#else

static inline bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev)