linux-kernel - Re: [PATCH v4 21/30] riscv/traps: Introduce software check exception

Open Source and information security mailing list archives

Message-ID: <CAFTtA3NA+OwZv5hJU3EWjuNHNjA3fQzPC+sX84Nb9YyJXdENSA@mail.gmail.com>
Date: Fri, 13 Sep 2024 21:35:50 +0200
From: Andy Chiu <andybnac@...il.com>
To: Deepak Gupta <debug@...osinc.com>
Cc: paul.walmsley@...ive.com, palmer@...ive.com, conor@...nel.org, 
	linux-doc@...r.kernel.org, linux-riscv@...ts.infradead.org, 
	linux-kernel@...r.kernel.org, devicetree@...r.kernel.org, 
	linux-fsdevel@...r.kernel.org, linux-mm@...ck.org, linux-arch@...r.kernel.org, 
	linux-kselftest@...r.kernel.org, quic_zhonhan@...cinc.com, zong.li@...ive.com, 
	zev@...ilderbeest.net, david@...hat.com, peterz@...radead.org, 
	catalin.marinas@....com, broonie@...nel.org, dave.hansen@...ux.intel.com, 
	atishp@...osinc.com, bjorn@...osinc.com, namcaov@...il.com, 
	usama.anjum@...labora.com, guoren@...nel.org, alx@...nel.org, 
	jszhang@...nel.org, hpa@...or.com, puranjay@...nel.org, shuah@...nel.org, 
	sorear@...tmail.com, costa.shul@...hat.com, robh@...nel.org, 
	antonb@...storrent.com, quic_bjorande@...cinc.com, lorenzo.stoakes@...cle.com, 
	corbet@....net, dawei.li@...ngroup.cn, anup@...infault.org, deller@....de, 
	x86@...nel.org, andrii@...nel.org, willy@...radead.org, kees@...nel.org, 
	mingo@...hat.com, libang.li@...group.com, samitolvanen@...gle.com, 
	greentime.hu@...ive.com, osalvador@...e.de, ajones@...tanamicro.com, 
	revest@...omium.org, ancientmodern4@...il.com, aou@...s.berkeley.edu, 
	jerry.shih@...ive.com, alexghiti@...osinc.com, arnd@...db.de, 
	yang.lee@...ux.alibaba.com, charlie@...osinc.com, bgray@...ux.ibm.com, 
	Liam.Howlett@...cle.com, leobras@...hat.com, songshuaishuai@...ylab.org, 
	xiao.w.wang@...el.com, bp@...en8.de, cuiyunhui@...edance.com, 
	mchitale@...tanamicro.com, cleger@...osinc.com, tglx@...utronix.de, 
	krzk+dt@...nel.org, vbabka@...e.cz, brauner@...nel.org, bhe@...hat.com, 
	ke.zhao@...ngroup.cn, oleg@...hat.com, samuel.holland@...ive.com, 
	ben.dooks@...ethink.co.uk, evan@...osinc.com, palmer@...belt.com, 
	ebiederm@...ssion.com, andy.chiu@...ive.com, schwab@...e.de, 
	akpm@...ux-foundation.org, sameo@...osinc.com, tanzhasanwork@...il.com, 
	rppt@...nel.org, ryan.roberts@....com
Subject: Re: [PATCH v4 21/30] riscv/traps: Introduce software check exception

Hi Deepak

Deepak Gupta <debug@...osinc.com> 於 2024年9月13日 週五 上午2:32寫道：
>
> zicfiss / zicfilp introduces a new exception to priv isa `software check
> exception` with cause code = 18. This patch implements software check
> exception.
>
> Additionally it implements a cfi violation handler which checks for code
> in xtval. If xtval=2, it means that sw check exception happened because of
> an indirect branch not landing on 4 byte aligned PC or not landing on
> `lpad` instruction or label value embedded in `lpad` not matching label
> value setup in `x7`. If xtval=3, it means that sw check exception happened
> because of mismatch between link register (x1 or x5) and top of shadow
> stack (on execution of `sspopchk`).
>
> In case of cfi violation, SIGSEGV is raised with code=SEGV_CPERR.
> SEGV_CPERR was introduced by x86 shadow stack patches.
>
> Signed-off-by: Deepak Gupta <debug@...osinc.com>
> ---
>  arch/riscv/include/asm/asm-prototypes.h |  1 +
>  arch/riscv/include/asm/entry-common.h   |  2 ++
>  arch/riscv/kernel/entry.S               |  3 ++
>  arch/riscv/kernel/traps.c               | 38 +++++++++++++++++++++++++
>  4 files changed, 44 insertions(+)
>
> diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h
> index cd627ec289f1..5a27cefd7805 100644
> --- a/arch/riscv/include/asm/asm-prototypes.h
> +++ b/arch/riscv/include/asm/asm-prototypes.h
> @@ -51,6 +51,7 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_u);
>  DECLARE_DO_ERROR_INFO(do_trap_ecall_s);
>  DECLARE_DO_ERROR_INFO(do_trap_ecall_m);
>  DECLARE_DO_ERROR_INFO(do_trap_break);
> +DECLARE_DO_ERROR_INFO(do_trap_software_check);
>
>  asmlinkage void handle_bad_stack(struct pt_regs *regs);
>  asmlinkage void do_page_fault(struct pt_regs *regs);
> diff --git a/arch/riscv/include/asm/entry-common.h b/arch/riscv/include/asm/entry-common.h
> index 2293e535f865..4068c7e5452a 100644
> --- a/arch/riscv/include/asm/entry-common.h
> +++ b/arch/riscv/include/asm/entry-common.h
> @@ -39,4 +39,6 @@ static inline int handle_misaligned_store(struct pt_regs *regs)
>  }
>  #endif
>
> +bool handle_user_cfi_violation(struct pt_regs *regs);
> +
>  #endif /* _ASM_RISCV_ENTRY_COMMON_H */
> diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
> index ca9203e6d76d..2ec75ba864a8 100644
> --- a/arch/riscv/kernel/entry.S
> +++ b/arch/riscv/kernel/entry.S
> @@ -384,6 +384,9 @@ SYM_DATA_START_LOCAL(excp_vect_table)
>         RISCV_PTR do_page_fault   /* load page fault */
>         RISCV_PTR do_trap_unknown
>         RISCV_PTR do_page_fault   /* store page fault */
> +       RISCV_PTR do_trap_unknown /* cause=16 */
> +       RISCV_PTR do_trap_unknown /* cause=17 */
> +       RISCV_PTR do_trap_software_check /* cause=18 is sw check exception */
>  SYM_DATA_END_LABEL(excp_vect_table, SYM_L_LOCAL, excp_vect_table_end)
>
>  #ifndef CONFIG_MMU
> diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c
> index 51ebfd23e007..32d1453bed72 100644
> --- a/arch/riscv/kernel/traps.c
> +++ b/arch/riscv/kernel/traps.c
> @@ -354,6 +354,44 @@ void do_trap_ecall_u(struct pt_regs *regs)
>
>  }
>
> +#define CFI_TVAL_FCFI_CODE     2
> +#define CFI_TVAL_BCFI_CODE     3
> +/* handle cfi violations */
> +bool handle_user_cfi_violation(struct pt_regs *regs)
> +{
> +       bool ret = false;
> +       unsigned long tval = csr_read(CSR_TVAL);
> +
> +       if (((tval == CFI_TVAL_FCFI_CODE) && cpu_supports_indirect_br_lp_instr()) ||
> +               ((tval == CFI_TVAL_BCFI_CODE) && cpu_supports_shadow_stack())) {
> +               do_trap_error(regs, SIGSEGV, SEGV_CPERR, regs->epc,
> +                                         "Oops - control flow violation");
> +               ret = true;
> +       }
> +
> +       return ret;
> +}
> +/*
> + * software check exception is defined with risc-v cfi spec. Software check
> + * exception is raised when:-
> + * a) An indirect branch doesn't land on 4 byte aligned PC or `lpad`
> + *    instruction or `label` value programmed in `lpad` instr doesn't
> + *    match with value setup in `x7`. reported code in `xtval` is 2.
> + * b) `sspopchk` instruction finds a mismatch between top of shadow stack (ssp)
> + *    and x1/x5. reported code in `xtval` is 3.
> + */

It seems like this trap handler does not follow generic entry. This
can cause problems as signal delivery is done in
irqentry_exit_to_user_mode(). Please reference the commit f0bddf50586d
("riscv: entry: Convert to generic entry") for more information.

> +asmlinkage __visible __trap_section void do_trap_software_check(struct pt_regs *regs)
> +{
> +       if (user_mode(regs)) {
> +               /* not a cfi violation, then merge into flow of unknown trap handler */
> +               if (!handle_user_cfi_violation(regs))
> +                       do_trap_unknown(regs);
> +       } else {
> +               /* sw check exception coming from kernel is a bug in kernel */
> +               die(regs, "Kernel BUG");
> +       }
> +}
> +
>  #ifdef CONFIG_MMU
>  asmlinkage __visible noinstr void do_page_fault(struct pt_regs *regs)
>  {
> --
> 2.45.0
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Cheers,
Andy

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