diff options
| author | Kees Cook <keescook@chromium.org> | 2014-04-03 22:29:50 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2014-10-16 23:38:54 +0200 |
| commit | 80d6b0c2eed2a504f6740cd1f5ea76dc50abfc4d (patch) | |
| tree | 32f6d8a1c5a2250cc3f303df545dfbf52da62d19 /arch/arm/kernel/machine_kexec.c | |
| parent | ARM: mm: allow non-text sections to be non-executable (diff) | |
| download | linux-80d6b0c2eed2a504f6740cd1f5ea76dc50abfc4d.tar.xz linux-80d6b0c2eed2a504f6740cd1f5ea76dc50abfc4d.zip | |
ARM: mm: allow text and rodata sections to be read-only
This introduces CONFIG_DEBUG_RODATA, making kernel text and rodata
read-only. Additionally, this splits rodata from text so that rodata can
also be NX, which may lead to wasted memory when aligning to SECTION_SIZE.
The read-only areas are made writable during ftrace updates and kexec.
Signed-off-by: Kees Cook <keescook@chromium.org>
Tested-by: Laura Abbott <lauraa@codeaurora.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Diffstat (limited to 'arch/arm/kernel/machine_kexec.c')
| -rw-r--r-- | arch/arm/kernel/machine_kexec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index 8f75250cbe30..4423a565ef6f 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -164,6 +164,7 @@ void machine_kexec(struct kimage *image) reboot_code_buffer = page_address(image->control_code_page); /* Prepare parameters for reboot_code_buffer*/ + set_kernel_text_rw(); kexec_start_address = image->start; kexec_indirection_page = page_list; kexec_mach_type = machine_arch_type; |