summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJessica Yu <jeyu@kernel.org>2020-09-01 18:00:16 +0200
committerCatalin Marinas <catalin.marinas@arm.com>2020-09-02 08:35:33 +0100
commite0328feda79d9681b3e3245e6e180295550c8ee9 (patch)
tree65c828ab97a8ea4bed8f9dfd917a8575989e884e /init
parent60295d50958e21da1df7311fd3c6aced1b3f1f04 (diff)
downloadlwn-e0328feda79d9681b3e3245e6e180295550c8ee9.tar.gz
lwn-e0328feda79d9681b3e3245e6e180295550c8ee9.zip
arm64/module: set trampoline section flags regardless of CONFIG_DYNAMIC_FTRACE
In the arm64 module linker script, the section .text.ftrace_trampoline is specified unconditionally regardless of whether CONFIG_DYNAMIC_FTRACE is enabled (this is simply due to the limitation that module linker scripts are not preprocessed like the vmlinux one). Normally, for .plt and .text.ftrace_trampoline, the section flags present in the module binary wouldn't matter since module_frob_arch_sections() would assign them manually anyway. However, the arm64 module loader only sets the section flags for .text.ftrace_trampoline when CONFIG_DYNAMIC_FTRACE=y. That's only become problematic recently due to a recent change in binutils-2.35, where the .text.ftrace_trampoline section (along with the .plt section) is now marked writable and executable (WAX). We no longer allow writable and executable sections to be loaded due to commit 5c3a7db0c7ec ("module: Harden STRICT_MODULE_RWX"), so this is causing all modules linked with binutils-2.35 to be rejected under arm64. Drop the IS_ENABLED(CONFIG_DYNAMIC_FTRACE) check in module_frob_arch_sections() so that the section flags for .text.ftrace_trampoline get properly set to SHF_EXECINSTR|SHF_ALLOC, without SHF_WRITE. Signed-off-by: Jessica Yu <jeyu@kernel.org> Acked-by: Will Deacon <will@kernel.org> Acked-by: Ard Biesheuvel <ardb@kernel.org> Link: http://lore.kernel.org/r/20200831094651.GA16385@linux-8ccs Link: https://lore.kernel.org/r/20200901160016.3646-1-jeyu@kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions