From: Matthias Kaehlcke <mka@chromium.org> To: Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org>, Kees Cook <keescook@chromium.org>, James Morris <jmorris@namei.org>, "Serge E . Hallyn" <serge@hallyn.com> Cc: linux-security-module@vger.kernel.org, dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, Song Liu <song@kernel.org>, Douglas Anderson <dianders@chromium.org>, Matthias Kaehlcke <mka@chromium.org> Subject: [PATCH v4 3/3] dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation Date: Tue, 17 May 2022 16:34:57 -0700 [thread overview] Message-ID: <20220517163437.v4.3.I5aca2dcc3b06de4bf53696cd21329dce8272b8aa@changeid> (raw) In-Reply-To: <20220517233457.1123309-1-mka@chromium.org> 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: Matthias Kaehlcke <mka@chromium.org> --- Changes in v4: - none Changes in v3: - none Changes in v2: - none drivers/md/Makefile | 7 +------ include/linux/dm-verity-loadpin.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 71771901c823..a96441752ec7 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile @@ -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 diff --git a/include/linux/dm-verity-loadpin.h b/include/linux/dm-verity-loadpin.h index c2bfd2b9c651..dd66ece9a751 100644 --- a/include/linux/dm-verity-loadpin.h +++ b/include/linux/dm-verity-loadpin.h @@ -15,7 +15,7 @@ struct 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_sb_trusted(struct super_block *sb); #else static inline bool dm_verity_loadpin_is_sb_trusted(struct super_block *sb); -- 2.36.0.550.gb090851708-goog
WARNING: multiple messages have this Message-ID (diff)
From: Matthias Kaehlcke <mka@chromium.org> To: Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org>, Kees Cook <keescook@chromium.org>, James Morris <jmorris@namei.org>, "Serge E . Hallyn" <serge@hallyn.com> Cc: dm-devel@redhat.com, Douglas Anderson <dianders@chromium.org>, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, Song Liu <song@kernel.org>, linux-security-module@vger.kernel.org, Matthias Kaehlcke <mka@chromium.org> Subject: [dm-devel] [PATCH v4 3/3] dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation Date: Tue, 17 May 2022 16:34:57 -0700 [thread overview] Message-ID: <20220517163437.v4.3.I5aca2dcc3b06de4bf53696cd21329dce8272b8aa@changeid> (raw) In-Reply-To: <20220517233457.1123309-1-mka@chromium.org> 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: Matthias Kaehlcke <mka@chromium.org> --- Changes in v4: - none Changes in v3: - none Changes in v2: - none drivers/md/Makefile | 7 +------ include/linux/dm-verity-loadpin.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 71771901c823..a96441752ec7 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile @@ -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 diff --git a/include/linux/dm-verity-loadpin.h b/include/linux/dm-verity-loadpin.h index c2bfd2b9c651..dd66ece9a751 100644 --- a/include/linux/dm-verity-loadpin.h +++ b/include/linux/dm-verity-loadpin.h @@ -15,7 +15,7 @@ struct 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_sb_trusted(struct super_block *sb); #else static inline bool dm_verity_loadpin_is_sb_trusted(struct super_block *sb); -- 2.36.0.550.gb090851708-goog -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-05-17 23:35 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-17 23:34 [PATCH v4 0/3] LoadPin: Enable loading from trusted dm-verity devices Matthias Kaehlcke 2022-05-17 23:34 ` [dm-devel] " Matthias Kaehlcke 2022-05-17 23:34 ` [PATCH v4 1/3] dm: Add verity helpers for LoadPin Matthias Kaehlcke 2022-05-17 23:34 ` [dm-devel] " Matthias Kaehlcke 2022-05-18 7:57 ` Milan Broz 2022-05-18 7:57 ` Milan Broz 2022-05-18 15:13 ` Matthias Kaehlcke 2022-05-18 15:13 ` Matthias Kaehlcke 2022-05-18 20:03 ` Mike Snitzer 2022-05-18 20:03 ` [dm-devel] " Mike Snitzer 2022-05-18 20:34 ` Matthias Kaehlcke 2022-05-18 20:34 ` [dm-devel] " Matthias Kaehlcke 2022-05-18 19:52 ` Mike Snitzer 2022-05-18 19:52 ` [dm-devel] " Mike Snitzer 2022-05-18 20:35 ` Matthias Kaehlcke 2022-05-18 20:35 ` [dm-devel] " Matthias Kaehlcke 2022-05-17 23:34 ` [PATCH v4 2/3] LoadPin: Enable loading from trusted dm-verity devices Matthias Kaehlcke 2022-05-17 23:34 ` [dm-devel] " Matthias Kaehlcke 2022-05-18 8:58 ` kernel test robot 2022-05-18 8:58 ` [dm-devel] " kernel test robot 2022-05-18 14:40 ` Matthias Kaehlcke 2022-05-18 14:40 ` Matthias Kaehlcke 2022-05-18 14:40 ` [dm-devel] " Matthias Kaehlcke 2022-05-18 12:40 ` kernel test robot 2022-05-18 12:40 ` kernel test robot 2022-05-17 23:34 ` Matthias Kaehlcke [this message] 2022-05-17 23:34 ` [dm-devel] [PATCH v4 3/3] dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation Matthias Kaehlcke 2022-05-18 19:23 ` [PATCH v4 0/3] LoadPin: Enable loading from trusted dm-verity devices Kees Cook 2022-05-18 19:23 ` [dm-devel] " Kees Cook 2022-05-18 19:43 ` Mike Snitzer 2022-05-18 19:43 ` [dm-devel] " Mike Snitzer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220517163437.v4.3.I5aca2dcc3b06de4bf53696cd21329dce8272b8aa@changeid \ --to=mka@chromium.org \ --cc=agk@redhat.com \ --cc=dianders@chromium.org \ --cc=dm-devel@redhat.com \ --cc=jmorris@namei.org \ --cc=keescook@chromium.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=serge@hallyn.com \ --cc=snitzer@kernel.org \ --cc=song@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.