Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 378691a7 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Kees Cook
Browse files

UPSTREAM: ARM: kexec: Make .text R/W in machine_kexec



With the introduction of Kees Cook's patch to make the kernel .text
read-only the existing method by which kexec works got broken since it
directly pokes some values in the template code, which resides in the
.text section.

The current patch changes the way those values are inserted so that poking
.text section occurs only in machine_kexec (e.g when we are about to nuke
the old kernel and are beyond the point of return). This allows to use
set_kernel_text_rw() to directly patch the values in the .text section.

I had already sent a patch which achieved this but it was significantly
more complicated, so this is a cleaner/straight-forward approach.

Signed-off-by: default avatarNikolay Borisov <Nikolay.Borisov@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
[kees: collapsed kexec_boot_atags (will.daecon)]
[kees: for bisectability, moved set_kernel_text_rw() to RODATA patch]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>

(cherry picked from commit 42d720d1731a9d7035c2812437c35e271ec4dd78)
Signed-off-by: default avatarKees Cook <keescook@google.com>
Change-Id: I176b498d5a2a439ecad93ddb8a06f3332c216749
parent 19d1aa8c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment