diff options
| author | Marcos Oduardo <marcos.oduardo@gmail.com> | 2026-02-23 00:51:50 +0100 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2026-03-09 12:11:24 +0530 |
| commit | 3baca10015393359ec46a2500c8ebe7daa9672c6 (patch) | |
| tree | 4b4829e3533d61ab862e0b1ca7e9b0e028554b88 /include | |
| parent | 8d1c21b38752301fc6c727eece45c15c663649b0 (diff) | |
| download | opensbi-3baca10015393359ec46a2500c8ebe7daa9672c6.tar.gz opensbi-3baca10015393359ec46a2500c8ebe7daa9672c6.tar.bz2 opensbi-3baca10015393359ec46a2500c8ebe7daa9672c6.zip | |
include: sbi: Fix illegal shift in sbi_domain.h
In sbi_domain.h, when checking if a memory region is a subset of
another, an undefined behavior arithmetic operation was caught
when sanitizing with UBSan (shift exponent __riscv_xlen).
This patch adds a check to handle the case where the region order
is __riscv_xlen, avoiding the illegal shift and ensuring the operation
remains defined.
Please let me know if there’s any other most suitable solution for
this bug.
Signed-off-by: Marcos Oduardo <marcos.oduardo@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260222235219.276432-1-marcos.oduardo@gmail.com
Signed-off-by: Anup Patel <anup@brainfault.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sbi/sbi_domain.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/sbi/sbi_domain.h b/include/sbi/sbi_domain.h index c8a6da99..16edd4ce 100644 --- a/include/sbi/sbi_domain.h +++ b/include/sbi/sbi_domain.h @@ -170,9 +170,11 @@ static inline bool sbi_domain_memregion_is_subset( const struct sbi_domain_memregion *regB) { ulong regA_start = regA->base; - ulong regA_end = regA->base + (BIT(regA->order) - 1); + ulong regA_mask = (regA->order >= __riscv_xlen) ? ~0UL : (BIT(regA->order) - 1); + ulong regA_end = regA_start + regA_mask; ulong regB_start = regB->base; - ulong regB_end = regB->base + (BIT(regB->order) - 1); + ulong regB_mask = (regB->order >= __riscv_xlen) ? ~0UL : (BIT(regB->order) - 1); + ulong regB_end = regB_start + regB_mask; if ((regB_start <= regA_start) && (regA_start < regB_end) && |