Merge patch series "riscv: Extension parsing fixes"

[J-linux.git] / arch / powerpc / lib / code-patching.c

diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
index 7af791446ddf19cce6bb1b4a77ae7bcbbdf800d5..0d1f3ee91115207500c7939aeddcee31a876a642 100644 (file)
--- a/arch/powerpc/lib/code-patching.c
+++ b/arch/powerpc/lib/code-patching.c
@@ -372,9 +372,32 @@ int patch_instruction(u32 *addr, ppc_inst_t instr)
 }
 NOKPROBE_SYMBOL(patch_instruction);
 
+static int patch_memset64(u64 *addr, u64 val, size_t count)
+{
+       for (u64 *end = addr + count; addr < end; addr++)
+               __put_kernel_nofault(addr, &val, u64, failed);
+
+       return 0;
+
+failed:
+       return -EPERM;
+}
+
+static int patch_memset32(u32 *addr, u32 val, size_t count)
+{
+       for (u32 *end = addr + count; addr < end; addr++)
+               __put_kernel_nofault(addr, &val, u32, failed);
+
+       return 0;
+
+failed:
+       return -EPERM;
+}
+
 static int __patch_instructions(u32 *patch_addr, u32 *code, size_t len, bool repeat_instr)
 {
        unsigned long start = (unsigned long)patch_addr;
+       int err;
 
        /* Repeat instruction */
        if (repeat_instr) {
@@ -383,19 +406,19 @@ static int __patch_instructions(u32 *patch_addr, u32 *code, size_t len, bool rep
                if (ppc_inst_prefixed(instr)) {
                        u64 val = ppc_inst_as_ulong(instr);
 
-                       memset64((u64 *)patch_addr, val, len / 8);
+                       err = patch_memset64((u64 *)patch_addr, val, len / 8);
                } else {
                        u32 val = ppc_inst_val(instr);
 
-                       memset32(patch_addr, val, len / 4);
+                       err = patch_memset32(patch_addr, val, len / 4);
                }
        } else {
-               memcpy(patch_addr, code, len);
+               err = copy_to_kernel_nofault(patch_addr, code, len);
        }
 
        smp_wmb();      /* smp write barrier */
        flush_icache_range(start, start + len);
-       return 0;
+       return err;
 }
 
 /*