Re: [PATCH 3/4] kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification

[joeyli]

On Tue, Feb 15, 2022 at 08:39:40PM +0100, Michal Suchanek wrote:
> 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")
> Cc: Philipp Rudo 
> Cc: kexec@lists.infradead.org
> Cc: keyri...@vger.kernel.org
> Cc: linux-security-mod...@vger.kernel.org
> Cc: sta...@kernel.org
> Signed-off-by: Michal Suchanek 

Reviewed-by: "Lee, Chun-Yi" 

> ---
>  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.31.1


___
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 3/4] kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification

[Michal Suchanek]

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")
Cc: Philipp Rudo 
Cc: kexec@lists.infradead.org
Cc: keyri...@vger.kernel.org
Cc: linux-security-mod...@vger.kernel.org
Cc: sta...@kernel.org
Signed-off-by: Michal Suchanek 
---
 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.31.1


___
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec