]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
iommufd/iova_bitmap: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
authorQasim Ijaz <qasdev00@gmail.com>
Mon, 13 Jan 2025 22:38:20 +0000 (22:38 +0000)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 14 Jan 2025 17:53:18 +0000 (13:53 -0400)
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: 58ccf0190d19 ("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>
drivers/iommu/iommufd/iova_bitmap.c

index ab665cf38ef4a9b8af98acaf51d16e99e3d63607..39a86a4a1d3af4a8944a8bc731884948d2bf2b1a 100644 (file)
@@ -130,7 +130,7 @@ struct iova_bitmap {
 static unsigned long iova_bitmap_offset_to_index(struct iova_bitmap *bitmap,
                                                 unsigned long iova)
 {
-       unsigned long pgsize = 1 << bitmap->mapped.pgshift;
+       unsigned long pgsize = 1UL << bitmap->mapped.pgshift;
 
        return iova / (BITS_PER_TYPE(*bitmap->bitmap) * pgsize);
 }