[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <YlzItpGMPat1BFPq@MiWiFi-R3L-srv>
Date: Mon, 18 Apr 2022 10:11:02 +0800
From: Baoquan He <bhe@...hat.com>
To: Coiby Xu <coxu@...hat.com>
Cc: kexec@...ts.infradead.org, linux-arm-kernel@...ts.infradead.org,
Michal Suchanek <msuchanek@...e.de>,
Dave Young <dyoung@...hat.com>, Will Deacon <will@...nel.org>,
"Eric W . Biederman" <ebiederm@...ssion.com>,
Mimi Zohar <zohar@...ux.ibm.com>, Chun-Yi Lee <jlee@...e.com>,
Philipp Rudo <prudo@...ux.ibm.com>, keyrings@...r.kernel.org,
linux-security-module@...r.kernel.org, stable@...nel.org,
Heiko Carstens <hca@...ux.ibm.com>,
Vasily Gorbik <gor@...ux.ibm.com>,
Alexander Gordeev <agordeev@...ux.ibm.com>,
Christian Borntraeger <borntraeger@...ux.ibm.com>,
Sven Schnelle <svens@...ux.ibm.com>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
"open list:S390" <linux-s390@...r.kernel.org>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v6 4/4] kexec, KEYS, s390: Make use of built-in and
secondary keyring for signature verification
On 04/14/22 at 09:43am, Coiby Xu wrote:
> From: Michal Suchanek <msuchanek@...e.de>
>
> commit e23a8020ce4e ("s390/kexec_file: Signature verification prototype")
> adds support for KEXEC_SIG verification with keys from platform keyring
> but the built-in keys and secondary keyring are not used.
>
> Add support for the built-in keys and secondary keyring as x86 does.
>
> Fixes: e23a8020ce4e ("s390/kexec_file: Signature verification prototype")
Should Cc stable kernel?
Otherwise, LGTM,
Acked-by: Baoquan He <bhe@...hat.com>
> Cc: Philipp Rudo <prudo@...ux.ibm.com>
> Cc: kexec@...ts.infradead.org
> Cc: keyrings@...r.kernel.org
> Cc: linux-security-module@...r.kernel.org
> Cc: stable@...nel.org
> Signed-off-by: Michal Suchanek <msuchanek@...e.de>
> Reviewed-by: "Lee, Chun-Yi" <jlee@...e.com>
> Signed-off-by: Coiby Xu <coxu@...hat.com>
> ---
> arch/s390/kernel/machine_kexec_file.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c
> index 8f43575a4dd3..fc6d5f58debe 100644
> --- a/arch/s390/kernel/machine_kexec_file.c
> +++ b/arch/s390/kernel/machine_kexec_file.c
> @@ -31,6 +31,7 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len)
> const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1;
> struct module_signature *ms;
> unsigned long sig_len;
> + int ret;
>
> /* Skip signature verification when not secure IPLed. */
> if (!ipl_secure_flag)
> @@ -65,11 +66,18 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len)
> return -EBADMSG;
> }
>
> - return verify_pkcs7_signature(kernel, kernel_len,
> - kernel + kernel_len, sig_len,
> - VERIFY_USE_PLATFORM_KEYRING,
> - VERIFYING_MODULE_SIGNATURE,
> - NULL, NULL);
> + ret = verify_pkcs7_signature(kernel, kernel_len,
> + kernel + kernel_len, sig_len,
> + VERIFY_USE_SECONDARY_KEYRING,
> + VERIFYING_MODULE_SIGNATURE,
> + NULL, NULL);
> + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING))
> + ret = verify_pkcs7_signature(kernel, kernel_len,
> + kernel + kernel_len, sig_len,
> + VERIFY_USE_PLATFORM_KEYRING,
> + VERIFYING_MODULE_SIGNATURE,
> + NULL, NULL);
> + return ret;
> }
> #endif /* CONFIG_KEXEC_SIG */
>
> --
> 2.34.1
>
>
Powered by blists - more mailing lists