ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/riscv: Do not allow sfence.vma from user mode 

The 'sfence.vma' instruction is privileged, and should only ever be allowed
when executing in supervisor mode or higher.

Signed-off-by: Jonathan Behrens <fintelia@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Jonathan Behrens 2019-04-01 15:12:07 -04:00 committed by Palmer Dabbelt
parent 30efbf330a
commit b86f416763
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/riscv/op_helper.c
View File

@ -145,9 +145,10 @@ void helper_tlb_flush(CPURISCVState *env)
{ {
RISCVCPU *cpu = riscv_env_get_cpu(env); RISCVCPU *cpu = riscv_env_get_cpu(env);
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
if (env->priv == PRV_S && if (!(env->priv >= PRV_S) ||
env->priv_ver >= PRIV_VERSION_1_10_0 && (env->priv == PRV_S &&
get_field(env->mstatus, MSTATUS_TVM)) { env->priv_ver >= PRIV_VERSION_1_10_0 &&
get_field(env->mstatus, MSTATUS_TVM))) {
riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC());
} else { } else {
tlb_flush(cs); tlb_flush(cs);