Unverified Commit f8162068 authored May 30, 2019 by Hesham Almatary Committed by Palmer Dabbelt Jun 23, 2019

RISC-V: Fix a PMP bug where it succeeds even if PMP entry is off



The current implementation returns 1 (PMP check success) if the address is in
range even if the PMP entry is off. This is a bug.

For example, if there is a PMP check in S-Mode which is in range, but its PMP
entry is off, this will succeed, which it should not.

The patch fixes this bug by only checking the PMP permissions if the address is
in range and its corresponding PMP entry it not off. Otherwise, it will keep
the ret = -1 which will be checked and handled correctly at the end of the
function.

Signed-off-by: Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>

parent 1f447aec

target/riscv/pmp.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -258,11 +258,12 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr,
		/* fully inside */
		const uint8_t a_field =
		pmp_get_a_field(env->pmp_state.pmp[i].cfg_reg);
		if ((s + e) == 2) {
		if (PMP_AMATCH_OFF == a_field) {
		return 1;
		}

		/*
		* If the PMP entry is not off and the address is in range, do the priv
		* check
		*/
		if (((s + e) == 2) && (PMP_AMATCH_OFF != a_field)) {
		allowed_privs = PMP_READ \| PMP_WRITE \| PMP_EXEC;
		if ((mode != PRV_M) \|\| pmp_is_locked(env, i)) {
		allowed_privs &= env->pmp_state.pmp[i].cfg_reg;