]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Sun, 27 Jan 2019 08:29:42 +0000 (09:29 +0100)
committerWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2019 14:07:23 +0000 (14:07 +0000)
commitc4fcae9da05ab6f3a926bbf65bcad1ee6ca894f4
treee75c363da6b48053bafc00af07b7b493e703edbd
parent512a1bda6505537691a4ee71cb9205a63e03fe23
arm64: kaslr: ensure randomized quantities are clean also when kaslr is off

Commit b0f672166a27 ("arm64: kaslr: ensure randomized quantities are
clean to the PoC") added cache maintenance to ensure that global
variables set by the kaslr init routine are not wiped clean due to
cache invalidation occurring during the second round of page table
creation.

However, if kaslr_early_init() exits early with no randomization
being applied (either due to the lack of a seed, or because the user
has disabled kaslr explicitly), no cache maintenance is performed,
leading to the same issue we attempted to fix earlier, as far as the
module_alloc_base variable is concerned.

Note that module_alloc_base cannot be initialized statically, because
that would cause it to be subject to a R_AARCH64_RELATIVE relocation,
causing it to be overwritten by the second round of KASLR relocation
processing.

Fixes: 5e08b63d024b ("arm64: add support for kernel ASLR")
Cc: <stable@vger.kernel.org> # v4.6+
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/kernel/kaslr.c