GitHub-Mirror/opensbi
2
0
Fork 0
mirror of https://github.com/Fishwaldo/opensbi.git synced 2025-06-27 08:38:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: sbi: Use finer permission semantics for address validation

Browse source 
Use the fine grained permisssion semantics for address validation
of a given region.

Signed-off-by: Himanshu Chauhan <hchauhan@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Tested-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Himanshu Chauhan 2023-01-09 05:20:36 +00:00 • committed by Anup Patel
parent 9e0ba09076
commit aace1e145d
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/sbi/sbi_domain.c
View file

@ -107,24 +107,34 @@ bool sbi_domain_check_addr(const struct sbi_domain *dom,
{ {
bool rmmio, mmio = false; bool rmmio, mmio = false;
struct sbi_domain_memregion *reg; struct sbi_domain_memregion *reg;
unsigned long rstart, rend, rflags, rwx = 0; unsigned long rstart, rend, rflags, rwx = 0, rrwx = 0;
if (!dom) if (!dom)
return false; return false;
/*
* Use M_{R/W/X} bits because the SU-bits are at the
* same relative offsets. If the mode is not M, the SU
* bits will fall at same offsets after the shift.
*/
if (access_flags & SBI_DOMAIN_READ) if (access_flags & SBI_DOMAIN_READ)
rwx |= SBI_DOMAIN_MEMREGION_READABLE; rwx |= SBI_DOMAIN_MEMREGION_M_READABLE;
if (access_flags & SBI_DOMAIN_WRITE) if (access_flags & SBI_DOMAIN_WRITE)
rwx |= SBI_DOMAIN_MEMREGION_WRITEABLE; rwx |= SBI_DOMAIN_MEMREGION_M_WRITABLE;
if (access_flags & SBI_DOMAIN_EXECUTE) if (access_flags & SBI_DOMAIN_EXECUTE)
rwx |= SBI_DOMAIN_MEMREGION_EXECUTABLE; rwx |= SBI_DOMAIN_MEMREGION_M_EXECUTABLE;
if (access_flags & SBI_DOMAIN_MMIO) if (access_flags & SBI_DOMAIN_MMIO)
mmio = true; mmio = true;
sbi_domain_for_each_memregion(dom, reg) { sbi_domain_for_each_memregion(dom, reg) {
rflags = reg->flags; rflags = reg->flags;
if (mode == PRV_M && !(rflags & SBI_DOMAIN_MEMREGION_MMODE)) rrwx = (mode == PRV_M ?
continue; (rflags & SBI_DOMAIN_MEMREGION_M_ACCESS_MASK) :
(rflags & SBI_DOMAIN_MEMREGION_SU_ACCESS_MASK)
>> SBI_DOMAIN_MEMREGION_SU_ACCESS_SHIFT);
rstart = reg->base; rstart = reg->base;
rend = (reg->order < __riscv_xlen) ? rend = (reg->order < __riscv_xlen) ?
@ -133,7 +143,7 @@ bool sbi_domain_check_addr(const struct sbi_domain *dom,
rmmio = (rflags & SBI_DOMAIN_MEMREGION_MMIO) ? true : false; rmmio = (rflags & SBI_DOMAIN_MEMREGION_MMIO) ? true : false;
if (mmio != rmmio) if (mmio != rmmio)
return false; return false;
return ((rflags & rwx) == rwx) ? true : false; return ((rrwx & rwx) == rwx) ? true : false;
} }
} }