linux-kernel - Re: [PATCH] arm64: Fix label placement in record_mmu

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMj1kXHzHhuiFDSULNQShKhiV3BVxkRhUrK1x7vM0vNnMPKO=w@mail.gmail.com>
Date:   Tue, 25 Apr 2023 19:11:46 +0100
From:   Ard Biesheuvel <ardb@...nel.org>
To:     Neeraj Upadhyay <quic_neeraju@...cinc.com>
Cc:     catalin.marinas@....com, mark.rutland@....com,
        kristina.martsenko@....com, maz@...nel.org, broonie@...nel.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] arm64: Fix label placement in record_mmu_state()

On Tue, 25 Apr 2023 at 10:57, Neeraj Upadhyay <quic_neeraju@...cinc.com> wrote:
>
> Fix label so that pre_disable_mmu_workaround() is called
> before clearing sctlr_el1.M.
>
> Fixes: 2ced0f30a426 ("arm64: head: Switch endianness before populating the ID map")
> Signed-off-by: Neeraj Upadhyay <quic_neeraju@...cinc.com>

Acked-by: Ard Biesheuvel <ardb@...nel.org>

> ---
>  arch/arm64/kernel/head.S | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
> index b98970907226..e92caebff46a 100644
> --- a/arch/arm64/kernel/head.S
> +++ b/arch/arm64/kernel/head.S
> @@ -150,8 +150,8 @@ CPU_BE( tbz x19, #SCTLR_ELx_EE_SHIFT, 1f    )
>         pre_disable_mmu_workaround
>         msr     sctlr_el2, x19
>         b       3f
> -       pre_disable_mmu_workaround
> -2:     msr     sctlr_el1, x19
> +2:     pre_disable_mmu_workaround
> +       msr     sctlr_el1, x19
>  3:     isb
>         mov     x19, xzr
>         ret
> --
> 2.17.1
>