iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification

Browse Source 
commit e23a8020ce ("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: e23a8020ce ("s390/kexec_file: Signature verification prototype")
Cc: stable@vger.kernel.org
Cc: Philipp Rudo <prudo@linux.ibm.com>
Cc: kexec@lists.infradead.org
Cc: keyrings@vger.kernel.org
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: "Lee, Chun-Yi" <jlee@suse.com>
Acked-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Coiby Xu <coxu@redhat.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Michal Suchanek 2022-07-14 21:40:27 +08:00 committed by Mimi Zohar
parent 0d519cadf7
commit 0828c4a39b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/s390/kernel/machine_kexec_file.c
View File

@ -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; const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1;
struct module_signature *ms; struct module_signature *ms;
unsigned long sig_len; unsigned long sig_len;
int ret;
/* Skip signature verification when not secure IPLed. */ /* Skip signature verification when not secure IPLed. */
if (!ipl_secure_flag) if (!ipl_secure_flag)
@ -65,11 +66,18 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len)
return -EBADMSG; return -EBADMSG;
} }
return verify_pkcs7_signature(kernel, kernel_len, ret = verify_pkcs7_signature(kernel, kernel_len,
kernel + kernel_len, sig_len, kernel + kernel_len, sig_len,
VERIFY_USE_PLATFORM_KEYRING, VERIFY_USE_SECONDARY_KEYRING,
VERIFYING_MODULE_SIGNATURE, VERIFYING_MODULE_SIGNATURE,
NULL, NULL); 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 */ #endif /* CONFIG_KEXEC_SIG */