From: Catalin Marinas <catalin.marinas@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: will.deacon@arm.com, stable@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
Date: Tue, 29 Jan 2019 18:18:10 +0000 [thread overview]
Message-ID: <20190129181809.GD224095@arrakis.emea.arm.com> (raw)
In-Reply-To: <20190127082942.21998-1-ard.biesheuvel@linaro.org>
On Sun, Jan 27, 2019 at 09:29:42AM +0100, Ard Biesheuvel wrote:
> Commit 1598ecda7b23 ("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: f80fb3a3d508 ("arm64: add support for kernel ASLR")
> Cc: <stable@vger.kernel.org> # v4.6+
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> arch/arm64/kernel/kaslr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c
> index ba6b41790fcd..b09b6f75f759 100644
> --- a/arch/arm64/kernel/kaslr.c
> +++ b/arch/arm64/kernel/kaslr.c
> @@ -88,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
> * we end up running with module randomization disabled.
> */
> module_alloc_base = (u64)_etext - MODULES_VSIZE;
> + __flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));
Do we need something similar of memstart_offset_seed? If yes, you could
as well change the returns to a goto out.
--
Catalin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-01-29 18:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-27 8:29 [PATCH] arm64: kaslr: ensure randomized quantities are clean also when kaslr is off Ard Biesheuvel
2019-01-29 18:18 ` Catalin Marinas [this message]
2019-01-29 21:55 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190129181809.GD224095@arrakis.emea.arm.com \
--to=catalin.marinas@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=stable@vger.kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).