From f41fc88e28edd2cac1761fda4fecda51e5cb1700 Mon Sep 17 00:00:00 2001 From: Jani Paalijarvi Date: Thu, 23 May 2024 10:43:33 +0300 Subject: [PATCH] riscv_pmp.c: Check that size is power of two for NAPOT The size must be power-of-two according to the the PMP spec. Signed-off-by: Jani Paalijarvi --- arch/risc-v/src/common/riscv_pmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/risc-v/src/common/riscv_pmp.c b/arch/risc-v/src/common/riscv_pmp.c index e6074b5154b02..1114390d5eb18 100644 --- a/arch/risc-v/src/common/riscv_pmp.c +++ b/arch/risc-v/src/common/riscv_pmp.c @@ -134,9 +134,9 @@ static bool pmp_check_region_attrs(uintptr_t base, uintptr_t size, case PMPCFG_A_NAPOT: { - /* For NAPOT, both base and size must be properly aligned */ + /* For NAPOT, Naturally aligned power-of-two region, >= 8 bytes */ - if ((base & 0x07) != 0 || size < 8) + if ((base & 0x07) != 0 || size < 8 || (size & (size - 1)) != 0) { return false; }