From 3baca10015393359ec46a2500c8ebe7daa9672c6 Mon Sep 17 00:00:00 2001 From: Marcos Oduardo Date: Mon, 23 Feb 2026 00:51:50 +0100 Subject: [PATCH] include: sbi: Fix illegal shift in sbi_domain.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Anup Patel Link: https://lore.kernel.org/r/20260222235219.276432-1-marcos.oduardo@gmail.com Signed-off-by: Anup Patel --- include/sbi/sbi_domain.h | 6 ++++-- 1 file 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) &&