Commit 979fe44a authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Heiko Carstens
Browse files

s390/ipl: fix virtual vs physical address confusion 



The value of ipl_cert_list_addr boot variable contains
a physical address, which is used directly. That works
because virtual and physical address spaces are currently
the same, but otherwise it is wrong.

While at it, fix also a comment for the platform keyring.

Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Acked-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Link: https://lore.kernel.org/r/20230816132942.2540411-1-agordeev@linux.ibm.com


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 386cb81e

arch/s390/kernel/machine_kexec_file.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int kexec_file_add_ipl_report(struct kimage *image, 
	data->memsz = ALIGN(data->memsz, PAGE_SIZE);

	buf.mem = data->memsz;



	ptr = (void *)ipl_cert_list_addr;

	ptr = __va(ipl_cert_list_addr);

	end = ptr + ipl_cert_list_size;

	ncerts = 0;

	while (ptr < end) {
@@ -200,7 +200,7 @@ static int kexec_file_add_ipl_report(struct kimage *image, 


	addr = data->memsz + data->report->size;

	addr += ncerts * sizeof(struct ipl_rb_certificate_entry);

	ptr = (void *)ipl_cert_list_addr;

	ptr = __va(ipl_cert_list_addr);

	while (ptr < end) {

		len = *(unsigned int *)ptr;

		ptr += sizeof(len);

arch/s390/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static void __init log_component_list(void) 
		pr_info("Linux is running with Secure-IPL enabled\n");

	else

		pr_info("Linux is running with Secure-IPL disabled\n");

	ptr = (void *) early_ipl_comp_list_addr;

	ptr = __va(early_ipl_comp_list_addr);

	end = (void *) ptr + early_ipl_comp_list_size;

	pr_info("The IPL report contains the following components:\n");

	while (ptr < end) {

security/integrity/platform_certs/load_ipl_s390.c

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ static int __init load_ipl_certs(void) 


	if (!ipl_cert_list_addr)

		return 0;

	/* Copy the certificates to the system keyring */

	ptr = (void *) ipl_cert_list_addr;

	/* Copy the certificates to the platform keyring */

	ptr = __va(ipl_cert_list_addr);

	end = ptr + ipl_cert_list_size;

	while ((void *) ptr < end) {

		len = *(unsigned int *) ptr;