Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rseq/selftests: arm: use udf instruction for RSEQ_SIG

Use udf as the guard instruction for the restartable sequence abort
handler.

Previously, the chosen signature was not a valid instruction, based
on the assumption that it could always sit in a literal pool. However,
there are compilation environments in which literal pools are not
available, for instance execute-only code. Therefore, we need to
choose a signature value that is also a valid instruction.

Handle compiling with -mbig-endian on ARMv6+, which generates binaries
with mixed code vs data endianness (little endian code, big endian
data).

Else mismatch between code endianness for the generated signatures and
data endianness for the RSEQ_SIG parameter passed to the rseq
registration will trigger application segmentation faults when the
kernel try to abort rseq critical sections.

Prior to ARMv6, -mbig-endian generates big-endian code and data, so
endianness should not be reversed in that case.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Joel Fernandes <joelaf@google.com>
CC: Catalin Marinas <catalin.marinas@arm.com>
CC: Dave Watson <davejwatson@fb.com>
CC: Will Deacon <will.deacon@arm.com>
CC: Shuah Khan <shuah@kernel.org>
CC: Andi Kleen <andi@firstfloor.org>
CC: linux-kselftest@vger.kernel.org
CC: "H . Peter Anvin" <hpa@zytor.com>
CC: Chris Lameter <cl@linux.com>
CC: Russell King <linux@arm.linux.org.uk>
CC: Michael Kerrisk <mtk.manpages@gmail.com>
CC: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>
CC: Paul Turner <pjt@google.com>
CC: Boqun Feng <boqun.feng@gmail.com>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Ben Maurer <bmaurer@fb.com>
CC: linux-api@vger.kernel.org
CC: Andy Lutomirski <luto@amacapital.net>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

authored by

Mathieu Desnoyers and committed by
Shuah Khan
2b845d4b 3d4d1f05

+50 -2
+50 -2
tools/testing/selftests/rseq/rseq-arm.h
··· 5 5 * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com> 6 6 */ 7 7 8 - #define RSEQ_SIG 0x53053053 8 + /* 9 + * RSEQ_SIG uses the udf A32 instruction with an uncommon immediate operand 10 + * value 0x5de3. This traps if user-space reaches this instruction by mistake, 11 + * and the uncommon operand ensures the kernel does not move the instruction 12 + * pointer to attacker-controlled code on rseq abort. 13 + * 14 + * The instruction pattern in the A32 instruction set is: 15 + * 16 + * e7f5def3 udf #24035 ; 0x5de3 17 + * 18 + * This translates to the following instruction pattern in the T16 instruction 19 + * set: 20 + * 21 + * little endian: 22 + * def3 udf #243 ; 0xf3 23 + * e7f5 b.n <7f5> 24 + * 25 + * pre-ARMv6 big endian code: 26 + * e7f5 b.n <7f5> 27 + * def3 udf #243 ; 0xf3 28 + * 29 + * ARMv6+ -mbig-endian generates mixed endianness code vs data: little-endian 30 + * code and big-endian data. Ensure the RSEQ_SIG data signature matches code 31 + * endianness. Prior to ARMv6, -mbig-endian generates big-endian code and data 32 + * (which match), so there is no need to reverse the endianness of the data 33 + * representation of the signature. However, the choice between BE32 and BE8 34 + * is done by the linker, so we cannot know whether code and data endianness 35 + * will be mixed before the linker is invoked. 36 + */ 37 + 38 + #define RSEQ_SIG_CODE 0xe7f5def3 39 + 40 + #ifndef __ASSEMBLER__ 41 + 42 + #define RSEQ_SIG_DATA \ 43 + ({ \ 44 + int sig; \ 45 + asm volatile ("b 2f\n\t" \ 46 + "1: .inst " __rseq_str(RSEQ_SIG_CODE) "\n\t" \ 47 + "2:\n\t" \ 48 + "ldr %[sig], 1b\n\t" \ 49 + : [sig] "=r" (sig)); \ 50 + sig; \ 51 + }) 52 + 53 + #define RSEQ_SIG RSEQ_SIG_DATA 54 + 55 + #endif 9 56 10 57 #define rseq_smp_mb() __asm__ __volatile__ ("dmb" ::: "memory", "cc") 11 58 #define rseq_smp_rmb() __asm__ __volatile__ ("dmb" ::: "memory", "cc") ··· 125 78 __rseq_str(table_label) ":\n\t" \ 126 79 ".word " __rseq_str(version) ", " __rseq_str(flags) "\n\t" \ 127 80 ".word " __rseq_str(start_ip) ", 0x0, " __rseq_str(post_commit_offset) ", 0x0, " __rseq_str(abort_ip) ", 0x0\n\t" \ 128 - ".word " __rseq_str(RSEQ_SIG) "\n\t" \ 81 + ".arm\n\t" \ 82 + ".inst " __rseq_str(RSEQ_SIG_CODE) "\n\t" \ 129 83 __rseq_str(label) ":\n\t" \ 130 84 teardown \ 131 85 "b %l[" __rseq_str(abort_label) "]\n\t"