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-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Song Liu <song@kernel.org>, linux-security-module@vger.kernel.org, Douglas Anderson <dianders@chromium.org>, dm-devel@redhat.com, Matthias Kaehlcke <mka@chromium.org> Subject: [PATCH 3/3] dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation Date: Mon, 18 Apr 2022 14:15:59 -0700 [thread overview] Message-ID: <20220418141545.3.I5aca2dcc3b06de4bf53696cd21329dce8272b8aa@changeid> (raw) In-Reply-To: <20220418211559.3832724-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> --- 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 e12cd004d375..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 @@ -100,12 +101,6 @@ ifeq ($(CONFIG_IMA),y) dm-mod-objs += dm-ima.o endif -ifeq ($(CONFIG_DM_VERITY),y) -ifeq ($(CONFIG_SECURITY_LOADPIN),y) -dm-mod-objs += dm-verity-loadpin.o -endif -endif - ifeq ($(CONFIG_DM_VERITY_FEC),y) dm-verity-objs += dm-verity-fec.o endif diff --git a/include/linux/dm-verity-loadpin.h b/include/linux/dm-verity-loadpin.h index 12a86911d05a..be63ac76f98d 100644 --- a/include/linux/dm-verity-loadpin.h +++ b/include/linux/dm-verity-loadpin.h @@ -13,7 +13,7 @@ struct trusted_root_digest { struct list_head node; }; -#if IS_ENABLED(CONFIG_SECURITY_LOADPIN) && IS_BUILTIN(CONFIG_DM_VERITY) +#if IS_ENABLED(CONFIG_SECURITY_LOADPIN_VERITY) void dm_verity_loadpin_set_trusted_root_digests(struct list_head *digests); bool dm_verity_loadpin_is_md_trusted(struct mapped_device *md); #else -- 2.36.0.rc0.470.gd361397f0d-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, linux-kernel@vger.kernel.org, Douglas Anderson <dianders@chromium.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 3/3] dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation Date: Mon, 18 Apr 2022 14:15:59 -0700 [thread overview] Message-ID: <20220418141545.3.I5aca2dcc3b06de4bf53696cd21329dce8272b8aa@changeid> (raw) In-Reply-To: <20220418211559.3832724-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> --- 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 e12cd004d375..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 @@ -100,12 +101,6 @@ ifeq ($(CONFIG_IMA),y) dm-mod-objs += dm-ima.o endif -ifeq ($(CONFIG_DM_VERITY),y) -ifeq ($(CONFIG_SECURITY_LOADPIN),y) -dm-mod-objs += dm-verity-loadpin.o -endif -endif - ifeq ($(CONFIG_DM_VERITY_FEC),y) dm-verity-objs += dm-verity-fec.o endif diff --git a/include/linux/dm-verity-loadpin.h b/include/linux/dm-verity-loadpin.h index 12a86911d05a..be63ac76f98d 100644 --- a/include/linux/dm-verity-loadpin.h +++ b/include/linux/dm-verity-loadpin.h @@ -13,7 +13,7 @@ struct trusted_root_digest { struct list_head node; }; -#if IS_ENABLED(CONFIG_SECURITY_LOADPIN) && IS_BUILTIN(CONFIG_DM_VERITY) +#if IS_ENABLED(CONFIG_SECURITY_LOADPIN_VERITY) void dm_verity_loadpin_set_trusted_root_digests(struct list_head *digests); bool dm_verity_loadpin_is_md_trusted(struct mapped_device *md); #else -- 2.36.0.rc0.470.gd361397f0d-goog -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-04-18 21:16 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-18 21:15 [PATCH 0/3] LoadPin: Enable loading from trusted dm-verity devices Matthias Kaehlcke 2022-04-18 21:15 ` [dm-devel] " Matthias Kaehlcke 2022-04-18 21:15 ` [PATCH 1/3] dm: Add verity helpers for LoadPin Matthias Kaehlcke 2022-04-18 21:15 ` [dm-devel] " Matthias Kaehlcke 2022-04-18 21:15 ` [PATCH 2/3] LoadPin: Enable loading from trusted dm-verity devices Matthias Kaehlcke 2022-04-18 21:15 ` [dm-devel] " Matthias Kaehlcke 2022-04-19 4:32 ` kernel test robot 2022-04-19 4:32 ` [dm-devel] " kernel test robot 2022-04-18 21:15 ` Matthias Kaehlcke [this message] 2022-04-18 21:15 ` [dm-devel] [PATCH 3/3] dm: verity-loadpin: Use CONFIG_SECURITY_LOADPIN_VERITY for conditional compilation Matthias Kaehlcke 2022-04-18 22:14 ` [PATCH 0/3] LoadPin: Enable loading from trusted dm-verity devices Kees Cook 2022-04-18 22:14 ` [dm-devel] " Kees Cook 2022-04-18 22:43 ` Matthias Kaehlcke 2022-04-18 22:43 ` [dm-devel] " Matthias Kaehlcke 2022-04-19 2:33 ` Kees Cook 2022-04-19 2:33 ` [dm-devel] " Kees Cook
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=20220418141545.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.