Skip to content

Commit cb4a261

Browse files
CIQ Kernel Automationroxanan1996
authored andcommitted
iommufd/iova_bitmap: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
jira VULN-53567 cve CVE-2025-21724 commit-author Qasim Ijaz <qasdev00@gmail.com> commit e24c155 Resolve a UBSAN shift-out-of-bounds issue in iova_bitmap_offset_to_index() where shifting the constant "1" (of type int) by bitmap->mapped.pgshift (an unsigned long value) could result in undefined behavior. The constant "1" defaults to a 32-bit "int", and when "pgshift" exceeds 31 (e.g., pgshift = 63) the shift operation overflows, as the result cannot be represented in a 32-bit type. To resolve this, the constant is updated to "1UL", promoting it to an unsigned long type to match the operand's type. Fixes: 58ccf01 ("vfio: Add an IOVA bitmap support") Link: https://patch.msgid.link/r/20250113223820.10713-1-qasdev00@gmail.com Reported-by: syzbot <syzbot+85992ace37d5b7b51635@syzkaller.appspotmail.com> Closes: https://syzkaller.appspot.com/bug?extid=85992ace37d5b7b51635 Signed-off-by: Qasim Ijaz <qasdev00@gmail.com> Reviewed-by: Joao Martins <joao.m.martins@oracle.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> (cherry picked from commit e24c155) Signed-off-by: CIQ Kernel Automation <ciq_kernel_automation@ciq.com>
1 parent 22f5b75 commit cb4a261

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/vfio/iova_bitmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ struct iova_bitmap {
127127
static unsigned long iova_bitmap_offset_to_index(struct iova_bitmap *bitmap,
128128
unsigned long iova)
129129
{
130-
unsigned long pgsize = 1 << bitmap->mapped.pgshift;
130+
unsigned long pgsize = 1UL << bitmap->mapped.pgshift;
131131

132132
return iova / (BITS_PER_TYPE(*bitmap->bitmap) * pgsize);
133133
}

0 commit comments

Comments
 (0)