linux-kernel - Re: [PATCH 2/6] riscv: avoid corrupting the RAS

Open Source and information security mailing list archives

Message-ID: <CANtDSirgLW2_QCOO7kLLotONcgnYC_mHOxW3=-2d+FJ3FfBduQ@mail.gmail.com>
Date: Thu, 20 Jun 2024 09:02:20 +1000
From: Cyril Bur <cyrilbur@...storrent.com>
To: Jisheng Zhang <jszhang@...nel.org>
Cc: Paul Walmsley <paul.walmsley@...ive.com>, Palmer Dabbelt <palmer@...belt.com>, 
	Albert Ou <aou@...s.berkeley.edu>, Samuel Holland <samuel.holland@...ive.com>, 
	linux-riscv@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/6] riscv: avoid corrupting the RAS

On Mon, Jun 17, 2024 at 3:21 AM Jisheng Zhang <jszhang@...nel.org> wrote:
>
> Inspired by[1], "modifying the return address of to point to
> ret_from_exception will corrupt the RAS", so modify the code
> to remove the code of modifying ra.
>
> Link: https://lore.kernel.org/linux-riscv/20240607061335.2197383-1-cyrilbur@tenstorrent.com/ [1]
> Signed-off-by: Jisheng Zhang <jszhang@...nel.org>

I've run this and it is the same idea that Anton used in the previous patch
Reviewed-by: Cyril Bur <cyrilbur@...storrent.com>

> ---
>  arch/riscv/kernel/entry.S | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
> index c933460ed3e9..81dec627a8d4 100644
> --- a/arch/riscv/kernel/entry.S
> +++ b/arch/riscv/kernel/entry.S
> @@ -235,8 +235,8 @@ SYM_CODE_START(ret_from_fork)
>         jalr s0
>  1:
>         move a0, sp /* pt_regs */
> -       la ra, ret_from_exception
> -       tail syscall_exit_to_user_mode
> +       call syscall_exit_to_user_mode
> +       j ret_from_exception
>  SYM_CODE_END(ret_from_fork)
>
>  #ifdef CONFIG_IRQ_STACKS
> --
> 2.43.0
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

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