From: Michal Suchanek <msuchanek@suse.de> To: unlisted-recipients:; (no To-header on input) Cc: Michal Suchanek <msuchanek@suse.de>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Philipp Rudo <prudo@redhat.com>, Baoquan He <bhe@redhat.com>, Alexander Egorenkov <egorenar@linux.ibm.com>, AKASHI Takahiro <takahiro.akashi@linaro.org>, James Morse <james.morse@arm.com>, Dave Young <dyoung@redhat.com>, Mimi Zohar <zohar@linux.ibm.com>, Kairui Song <kasong@redhat.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-modules@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, stable@kernel.org Subject: [PATCH 4/4] module, KEYS: Make use of platform keyring for signature verification Date: Tue, 15 Feb 2022 20:39:41 +0100 [thread overview] Message-ID: <840433bc93a58d6dfc4d96c34c0c3b158a0e669d.1644953683.git.msuchanek@suse.de> (raw) In-Reply-To: <cover.1644953683.git.msuchanek@suse.de> Commit 278311e417be ("kexec, KEYS: Make use of platform keyring for signature verify") adds support for use of platform keyring in kexec verification but support for modules is missing. Add support for verification of modules with keys from platform keyring as well. Fixes: 219a3e8676f3 ("integrity, KEYS: add a reference to platform keyring") Cc: linux-modules@vger.kernel.org Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Cc: stable@kernel.org Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- kernel/module_signing.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/module_signing.c b/kernel/module_signing.c index 8723ae70ea1f..5e1624294874 100644 --- a/kernel/module_signing.c +++ b/kernel/module_signing.c @@ -38,8 +38,14 @@ int mod_verify_sig(const void *mod, struct load_info *info) modlen -= sig_len + sizeof(ms); info->len = modlen; - return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, - VERIFY_USE_SECONDARY_KEYRING, - VERIFYING_MODULE_SIGNATURE, - NULL, NULL); + ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) + ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + return ret; } -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Michal Suchanek <msuchanek@suse.de> Cc: Michal Suchanek <msuchanek@suse.de>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Philipp Rudo <prudo@redhat.com>, Baoquan He <bhe@redhat.com>, Alexander Egorenkov <egorenar@linux.ibm.com>, AKASHI Takahiro <takahiro.akashi@linaro.org>, James Morse <james.morse@arm.com>, Dave Young <dyoung@redhat.com>, Mimi Zohar <zohar@linux.ibm.com>, Kairui Song <kasong@redhat.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-modules@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, stable@kernel.org Subject: [PATCH 4/4] module, KEYS: Make use of platform keyring for signature verification Date: Tue, 15 Feb 2022 20:39:41 +0100 [thread overview] Message-ID: <840433bc93a58d6dfc4d96c34c0c3b158a0e669d.1644953683.git.msuchanek@suse.de> (raw) In-Reply-To: <cover.1644953683.git.msuchanek@suse.de> Commit 278311e417be ("kexec, KEYS: Make use of platform keyring for signature verify") adds support for use of platform keyring in kexec verification but support for modules is missing. Add support for verification of modules with keys from platform keyring as well. Fixes: 219a3e8676f3 ("integrity, KEYS: add a reference to platform keyring") Cc: linux-modules@vger.kernel.org Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Cc: stable@kernel.org Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- kernel/module_signing.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/module_signing.c b/kernel/module_signing.c index 8723ae70ea1f..5e1624294874 100644 --- a/kernel/module_signing.c +++ b/kernel/module_signing.c @@ -38,8 +38,14 @@ int mod_verify_sig(const void *mod, struct load_info *info) modlen -= sig_len + sizeof(ms); info->len = modlen; - return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, - VERIFY_USE_SECONDARY_KEYRING, - VERIFYING_MODULE_SIGNATURE, - NULL, NULL); + ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) + ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + return ret; } -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-02-15 19:40 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-15 19:39 [PATCH 0/4] Unifrom keyring support across architectures and functions Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-02-15 19:39 ` [PATCH 1/4] Fix arm64 kexec forbidding kernels signed with keys in the secondary keyring to boot Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-04-06 15:41 ` joeyli 2022-04-06 15:41 ` joeyli 2022-04-06 15:41 ` joeyli 2022-04-08 7:11 ` Baoquan He 2022-04-08 7:11 ` Baoquan He 2022-04-08 7:11 ` Baoquan He 2022-02-15 19:39 ` [PATCH 2/4] kexec, KEYS, arm64: Make use of platform keyring for signature verification Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-04-06 15:45 ` joeyli 2022-04-06 15:45 ` joeyli 2022-04-06 15:45 ` joeyli 2022-02-15 19:39 ` [PATCH 3/4] kexec, KEYS, s390: Make use of built-in and secondary " Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-02-15 19:39 ` Michal Suchanek 2022-04-06 15:46 ` joeyli 2022-04-06 15:46 ` joeyli 2022-04-06 15:46 ` joeyli 2022-02-15 19:39 ` Michal Suchanek [this message] 2022-02-15 19:39 ` [PATCH 4/4] module, KEYS: Make use of platform " Michal Suchanek 2022-02-15 20:08 ` Mimi Zohar 2022-02-15 20:08 ` Mimi Zohar 2022-02-15 20:47 ` Michal Suchánek 2022-02-15 20:47 ` Michal Suchánek 2022-02-15 22:12 ` Mimi Zohar 2022-02-15 22:12 ` Mimi Zohar 2022-02-16 10:56 ` Michal Suchánek 2022-02-16 10:56 ` Michal Suchánek 2022-02-16 11:04 ` Michal Suchánek 2022-02-16 11:04 ` Michal Suchánek 2022-02-16 11:58 ` Mimi Zohar 2022-02-16 11:58 ` Mimi Zohar 2022-02-16 12:09 ` Michal Suchánek 2022-02-16 12:09 ` Michal Suchánek 2022-03-22 17:37 ` Luis Chamberlain 2022-03-22 17:37 ` Luis Chamberlain 2022-03-22 18:55 ` Mimi Zohar 2022-03-22 18:55 ` Mimi Zohar 2022-03-28 10:15 ` joeyli 2022-03-28 10:15 ` joeyli 2022-03-28 13:28 ` Mimi Zohar 2022-03-28 13:28 ` Mimi Zohar 2022-03-28 14:03 ` Michal Suchánek 2022-03-28 14:03 ` Michal Suchánek 2022-03-28 14:44 ` Eric Snowberg 2022-03-28 14:44 ` Eric Snowberg 2022-03-28 16:29 ` Michal Suchánek 2022-03-28 16:29 ` Michal Suchánek 2022-04-08 7:47 ` [PATCH 0/4] Unifrom keyring support across architectures and functions Coiby Xu 2022-04-08 7:47 ` Coiby Xu 2022-04-08 7:47 ` Coiby Xu 2022-04-08 8:51 ` Michal Suchánek 2022-04-08 8:51 ` Michal =?unknown-8bit?q?Such=C3=A1nek?= 2022-04-08 8:51 ` Michal Suchánek
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=840433bc93a58d6dfc4d96c34c0c3b158a0e669d.1644953683.git.msuchanek@suse.de \ --to=msuchanek@suse.de \ --cc=agordeev@linux.ibm.com \ --cc=bhe@redhat.com \ --cc=borntraeger@linux.ibm.com \ --cc=catalin.marinas@arm.com \ --cc=dyoung@redhat.com \ --cc=egorenar@linux.ibm.com \ --cc=gor@linux.ibm.com \ --cc=hca@linux.ibm.com \ --cc=james.morse@arm.com \ --cc=kasong@redhat.com \ --cc=keyrings@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-modules@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=prudo@redhat.com \ --cc=schwidefsky@de.ibm.com \ --cc=stable@kernel.org \ --cc=svens@linux.ibm.com \ --cc=takahiro.akashi@linaro.org \ --cc=will@kernel.org \ --cc=zohar@linux.ibm.com \ /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.