[PATCH] powerpc/kprobes: Handle error returned by set_memory_rox()

Christophe Leroy posted 1 patch 1 year, 11 months ago
arch/powerpc/kernel/kprobes.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
[PATCH] powerpc/kprobes: Handle error returned by set_memory_rox()
Posted by Christophe Leroy 1 year, 11 months ago
set_memory_rox() can fail.

In case it fails, free allocated memory and return NULL.

Link: https://github.com/KSPP/linux/issues/7
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/kernel/kprobes.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index b20ee72e873a..bbca90a5e2ec 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -134,10 +134,16 @@ void *alloc_insn_page(void)
 	if (!page)
 		return NULL;
 
-	if (strict_module_rwx_enabled())
-		set_memory_rox((unsigned long)page, 1);
+	if (strict_module_rwx_enabled()) {
+		int err = set_memory_rox((unsigned long)page, 1);
 
+		if (err)
+			goto error;
+	}
 	return page;
+error:
+	module_memfree(page);
+	return NULL;
 }
 
 int arch_prepare_kprobe(struct kprobe *p)
-- 
2.43.0
Re: [PATCH] powerpc/kprobes: Handle error returned by set_memory_rox()
Posted by Michael Ellerman 1 year, 11 months ago
On Fri, 16 Feb 2024 11:13:28 +0100, Christophe Leroy wrote:
> set_memory_rox() can fail.
> 
> In case it fails, free allocated memory and return NULL.
> 
> 

Applied to powerpc/next.

[1/1] powerpc/kprobes: Handle error returned by set_memory_rox()
      https://git.kernel.org/powerpc/c/f7f18e30b468458b2611ca65d745b50edcda9f43

cheers