Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / kprobes.c

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index b20ee72e873a1b881283ded2c8ffef94acf187f7..bbca90a5e2ec07a59903b87bf2d50f6a194235fd 100644 (file)
--- 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)