From: Heiko Carstens <hca@linux.ibm.com>
To: Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Mike Rapoport <rppt@kernel.org>,
Sven Schnelle <svens@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Subject: [PATCH 4/8] s390/module: Add error handling to module_alloc_ftrace_hotpatch_trampolines()
Date: Wed, 18 Nov 2026 15:47:05 +0100 [thread overview]
Message-ID: <20261118144709.202520-5-hca@linux.ibm.com> (raw)
In-Reply-To: <20261118144709.202520-1-hca@linux.ibm.com>
Let module_alloc_ftrace_hotpatch_trampolines() return NULL, instead of
a pointer to a not executable page if set_memory_rox() fails.
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---
arch/s390/kernel/module.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index 9d1f8a50f5a4..86ace854e22d 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -473,13 +473,18 @@ static int module_alloc_ftrace_hotpatch_trampolines(struct module *me,
char *start, *end;
int numpages;
size_t size;
+ int rc;
size = FTRACE_HOTPATCH_TRAMPOLINES_SIZE(s->sh_size);
numpages = DIV_ROUND_UP(size, PAGE_SIZE);
start = execmem_alloc(EXECMEM_FTRACE, numpages * PAGE_SIZE);
if (!start)
return -ENOMEM;
- set_memory_rox((unsigned long)start, numpages);
+ rc = set_memory_rox((unsigned long)start, numpages);
+ if (rc) {
+ execmem_free(start);
+ return rc;
+ }
end = start + size;
me->arch.trampolines_start = (struct ftrace_hotpatch_trampoline *)start;
--
2.56.1
next prev parent reply other threads:[~2026-11-18 14:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 14:47 [PATCH 0/8] s390: Add __must_check to set_memory() primitives Heiko Carstens
2026-11-18 14:47 ` [PATCH 1/8] s390/kfence: Add error handling to arch_kfence_init_pool() Heiko Carstens
2026-11-18 14:53 ` sashiko-bot
2026-11-18 14:47 ` [PATCH 2/8] s390/kprobes: Add error handling to alloc_insn_page() Heiko Carstens
2026-11-18 14:54 ` sashiko-bot
2026-11-18 14:47 ` [PATCH 3/8] s390/kexec: Let crash_protect_pages() warn in case of an error Heiko Carstens
2026-11-18 15:05 ` sashiko-bot
2026-11-18 14:47 ` Heiko Carstens [this message]
2026-11-18 15:01 ` [PATCH 4/8] s390/module: Add error handling to module_alloc_ftrace_hotpatch_trampolines() sashiko-bot
2026-11-18 14:47 ` [PATCH 5/8] s390/mm: Add error handling to arch_setup_zero_pages() Heiko Carstens
2026-11-18 14:51 ` sashiko-bot
2026-11-18 14:47 ` [PATCH 6/8] s390/mm: Add error handling to mark_rodata_ro() Heiko Carstens
2026-11-18 14:51 ` sashiko-bot
2026-11-18 14:47 ` [PATCH 7/8] s390/mm: Add error handling to vmem_map_init() Heiko Carstens
2026-11-18 14:50 ` sashiko-bot
2026-11-18 14:47 ` [PATCH 8/8] s390/set_memory: Add __must_check to set_memory() primitives Heiko Carstens
2026-11-18 14:52 ` sashiko-bot
2026-11-19 8:29 ` [PATCH 0/8] s390: " Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118144709.202520-5-hca@linux.ibm.com \
--to=hca@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=svens@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.