arm64: probes: Fix simulate_ldr*_literal()

commit 50f813e57601c22b6f26ced3193b9b94d70a2640 upstream.

The simulate_ldr_literal() code always loads a 64-bit quantity, and when
simulating a 32-bit load into a 'W' register, it discards the most
significant 32 bits. For big-endian kernels this means that the relevant
bits are discarded, and the value returned is the the subsequent 32 bits
in memory (i.e. the value at addr + 4).

Additionally, simulate_ldr_literal() and simulate_ldrsw_literal() use a
plain C load, which the compiler may tear or elide (e.g. if the target
is the zero register). Today this doesn't happen to matter, but it may
matter in future if trampoline code uses a LDR (literal) or LDRSW
(literal).

Update simulate_ldr_literal() and simulate_ldrsw_literal() to use an
appropriately-sized READ_ONCE() to perform the access, which avoids
these problems.

Fixes: 39a67d49ba35 ("arm64: kprobes instruction simulation support")
Cc: stable@vger.kernel.org
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20241008155851.801546-3-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/kernel/probes/simulate-insn.c b/arch/arm64/kernel/probes/simulate-insn.c
index 25f67ec596353eed2bd994945e2495e418a264c8..7d63423eafc2720aed9c38cf49355a309bb52fff 100644 (file)
--- a/arch/arm64/kernel/probes/simulate-insn.c
+++ b/arch/arm64/kernel/probes/simulate-insn.c
@@ -170,17 +170,15 @@ simulate_tbz_tbnz(u32 opcode, long addr, struct pt_regs *regs)
 void __kprobes
 simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
 {
-       u64 *load_addr;
+       unsigned long load_addr;
        int xn = opcode & 0x1f;
-       int disp;
 
-       disp = ldr_displacement(opcode);
-       load_addr = (u64 *) (addr + disp);
+       load_addr = addr + ldr_displacement(opcode);
 
        if (opcode & (1 << 30)) /* x0-x30 */
-               set_x_reg(regs, xn, *load_addr);
+               set_x_reg(regs, xn, READ_ONCE(*(u64 *)load_addr));
        else                    /* w0-w30 */
-               set_w_reg(regs, xn, *load_addr);
+               set_w_reg(regs, xn, READ_ONCE(*(u32 *)load_addr));
 
        instruction_pointer_set(regs, instruction_pointer(regs) + 4);
 }
@@ -188,14 +186,12 @@ simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
 void __kprobes
 simulate_ldrsw_literal(u32 opcode, long addr, struct pt_regs *regs)
 {
-       s32 *load_addr;
+       unsigned long load_addr;
        int xn = opcode & 0x1f;
-       int disp;
 
-       disp = ldr_displacement(opcode);
-       load_addr = (s32 *) (addr + disp);
+       load_addr = addr + ldr_displacement(opcode);
 
-       set_x_reg(regs, xn, *load_addr);
+       set_x_reg(regs, xn, READ_ONCE(*(s32 *)load_addr));
 
        instruction_pointer_set(regs, instruction_pointer(regs) + 4);
 }