Mark Rutland 8486e54d30 arm64: ftrace: fix !CONFIG_ARM64_MODULE_PLTS kernels ... When a kernel is built without CONFIG_ARM64_MODULE_PLTS, we don't generate the expected branch instruction in ftrace_make_nop(). This means we pass zero (rather than a valid branch) to ftrace_modify_code() as the expected instruction to validate. This causes us to return -EINVAL to the core ftrace code for a valid case, resulting in a splat at boot time. This was an unintended effect of commit: 687644209a ("arm64: ftrace: fix building without CONFIG_MODULES") ... which incorrectly moved the generation of the branch instruction into the ifdef for CONFIG_ARM64_MODULE_PLTS. This patch fixes the issue by moving the ifdef inside of the relevant if-else case, and always checking that the branch is in range, regardless of CONFIG_ARM64_MODULE_PLTS. This ensures that we generate the expected branch instruction, and also improves our sanity checks. For consistency, both ftrace_make_nop() and ftrace_make_call() are updated with this pattern. Fixes: 687644209a ("arm64: ftrace: fix building without CONFIG_MODULES") Signed-off-by: Mark Rutland <mark.rutland@arm.com> Reported-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>		2017-06-23 18:21:13 +01:00
..
boot	arm64: dts: hikey: Fix WiFi support	2017-05-23 14:18:10 +02:00
configs	arm64: defconfig: enable options needed for QCom DB410c board	2017-05-19 00:01:37 -07:00
crypto	Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"	2017-04-24 16:09:50 +08:00
include	arm64: signal: Allow expansion of the signal frame	2017-06-23 18:20:18 +01:00
kernel	arm64: ftrace: fix !CONFIG_ARM64_MODULE_PLTS kernels	2017-06-23 18:21:13 +01:00
kvm	arm64: KVM: Do not use stack-protector to compile EL2 code	2017-05-15 11:31:16 +02:00
lib	arm64: switch to RAW_COPY_USER	2017-03-28 18:23:24 -04:00
mm	arm64/dma-mapping: Remove extraneous null-pointer checks	2017-06-15 11:40:22 +01:00
net	bpf, arm64: fix faulty emission of map access in tail calls	2017-05-11 12:41:31 -04:00
xen	xen/privcmd: Add IOCTL_PRIVCMD_DM_OP	2017-02-14 15:13:43 -05:00
Kconfig	arm64: mm: select CONFIG_ARCH_PROC_KCORE_TEXT	2017-06-20 12:42:58 +01:00
Kconfig.debug	arm64: relocation testing module	2017-04-04 17:03:32 +01:00
Kconfig.platforms	mvebu arm64 for 4.12	2017-05-10 15:36:43 +02:00
Makefile	arm64: pass machine size to sparse	2017-06-20 16:47:16 +01:00