Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61a1793b authored by Michal Suchanek's avatar Michal Suchanek Committed by Greg Kroah-Hartman
Browse files

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



commit 0828c4a39be57768b8788e8cbd0d84683ea757e5 upstream.

commit e23a8020 ("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: e23a8020 ("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: default avatarMichal Suchanek <msuchanek@suse.de>
Reviewed-by: default avatar"Lee, Chun-Yi" <jlee@suse.com>
Acked-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarCoiby Xu <coxu@redhat.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37690cb8

arch/s390/kernel/machine_kexec_file.c

+13 −5
Original line number Diff line number Diff line
@@ -29,6 +29,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)
@@ -63,11 +64,18 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) 
		return -EBADMSG;

	}



	return verify_pkcs7_signature(kernel, kernel_len,

	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 */