KEYS: Make use of platform keyring for module signature verify
PATCH 1/1 KEYS: Make use of platform keyring for module signature verify
This patch completes commit 278311e417be ("kexec, KEYS: Make use of platform keyring for signature verify") which, while adding the platform keyring for bzImage verification, neglected to also add this keyring for module verification.
As such, kernel modules signed with keys from the MokList variable were not successfully verified.
--- kernel/module_signing.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
kernel/module_signing.c +12 -4
@@ -49,6 +49,7 @@ int mod_verify_sig(const void *mod, struct load_info *info) {struct module_signature ms;size_t sig_len, modlen = info->len; +int ret;pr_devel ("==>%s(,%zu)\n" , __func__, modlen);
@@ -82,8 +83,15 @@ int mod_verify_sig(const void *mod, struct load_info *info)return -EBADMSG ; } -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; }
Signature · 1 line
2.20.1
Quoted 5 lines · Robert Holmes
This patch completes commit
278311e417be("kexec, KEYS: Make use of platform keyring for signature verify") which, while adding the platform keyring for bzImage verification, neglected to also add this keyring for module verification.
You should most likely add the keyrings list to the cc: for these kinds of patches.
Quoted 41 lines
As such, kernel modules signed with keys from the MokList variable were not successfully verified.
Signed-off-by Robert Holmes <[email protected]>--- kernel/module_signing.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)kernel/module_signing.c +12
-4@@ -49,6 +49,7 @@ int mod_verify_sig(const void *mod, struct load_info *info) {struct module_signature ms;size_t sig_len, modlen = info->len; +int ret;pr_devel ("==>%s(,%zu)\n" , __func__, modlen);@@ -82,8 +83,15 @@ int mod_verify_sig(const void *mod, struct load_info *info)return -EBADMSG ; } -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; }
Signature · 2 lines
James Morris <[email protected]>