[PATCH 7/8] s390/mm: Add error handling to vmem_map_init()

From: Heiko Carstens

Date: Wed Nov 18 2026 - 09:47:54 EST


If any of the set_memory() calls in vmem_map_init() fails just panic.
This should never happen, and would lead to a broken kernel mapping.

Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx>
---
arch/s390/mm/vmem.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index d2879ce860a1..317bd01dca86 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -671,18 +671,22 @@ void vmem_unmap_4k_page(unsigned long addr)

void __init vmem_map_init(void)
{
- __set_memory_rox(_stext, _etext);
- __set_memory_ro(_etext, __end_rodata);
- __set_memory_rox(__stext_amode31, __etext_amode31);
+ int rc;
+
+ rc = __set_memory_rox(_stext, _etext);
+ rc |= __set_memory_ro(_etext, __end_rodata);
+ rc |= __set_memory_rox(__stext_amode31, __etext_amode31);
/*
* If the BEAR-enhancement facility is not installed the first
* prefix page is used to return to the previous context with
* an LPSWE instruction and therefore must be executable.
*/
if (!cpu_has_bear())
- set_memory_x(0, 1);
+ rc |= set_memory_x(0, 1);
if (debug_pagealloc_enabled())
- __set_memory_4k(__va(0), absolute_pointer(__va(0)) + ident_map_size);
+ rc |= __set_memory_4k(__va(0), absolute_pointer(__va(0)) + ident_map_size);
+ if (rc)
+ panic("Failed to set kernel mapping permissions");
pr_info("Write protected kernel read-only data: %luk\n",
(unsigned long)(__end_rodata - _stext) >> 10);
}
--
2.56.1