iommu: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
PATCH 1/1 iommu: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
This patch resolves 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.
--- drivers/iommu/iommufd/iova_bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommufd/iova_bitmap.c +1 -1
@@ -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); }
Signature · 1 line
2.39.5
Quoted 1 line · Qasim Ijaz
This patch resolves a UBSAN shift-out-of-bounds issue in
Avoid the 'this patch' e.g. Resolve a UBSAN shift-out-of-bonds (...)
The Subject component part could also be a bit more specific e.g.
iommufd/iova_bitmap: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
Quoted 6 lines
iova_bitmap_offset_to_index()where shifting the constant "1" (of type int) bybitmap->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.
Quoted 6 lines
To resolve this, the constant is updated to "1UL", promoting it to an unsigned long type to match the operand's type.
Reported-by syzbot <[email protected]>Signed-off-by Qasim Ijaz <[email protected]>
With those two nits:
Quoted 17 lines
--- drivers/iommu/iommufd/iova_bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/iommufd/iova_bitmap.c +1
-1@@ -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); }
Quoted 18 lines · Joao Martins
Quoted 1 line · Qasim Ijaz
This patch resolves a UBSAN shift-out-of-bounds issue in
Avoid the 'this patch' e.g. Resolve a UBSAN shift-out-of-bonds (...)
The Subject component part could also be a bit more specific e.g.
iommufd/iova_bitmap: Fix shift-out-of-bounds in
iova_bitmap_offset_to_index()Quoted 9 lines
iova_bitmap_offset_to_index()where shifting the constant "1" (of type int) bybitmap->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.
Quoted 7 lines
Quoted 3 lines
Reported-by syzbot <[email protected]>Signed-off-by Qasim Ijaz <[email protected]>With those two nits:
Reviewed-by Joao Martins <[email protected]>
It needs a fixes line too
Jason
Quoted 23 lines · Jason Gunthorpe
Quoted 22 lines · Joao Martins
Quoted 1 line · Qasim Ijaz
This patch resolves a UBSAN shift-out-of-bounds issue in
Avoid the 'this patch' e.g. Resolve a UBSAN shift-out-of-bonds (...)
The Subject component part could also be a bit more specific e.g.
iommufd/iova_bitmap: Fix shift-out-of-bounds in
iova_bitmap_offset_to_index()Quoted 12 lines
iova_bitmap_offset_to_index()where shifting the constant "1" (of type int) bybitmap->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.
Reported-by syzbot <[email protected]>Signed-off-by Qasim Ijaz <[email protected]>
Quoted 5 lines
Quoted 3 lines
With those two nits:
Reviewed-by Joao Martins <[email protected]>It needs a fixes line too
It should be
Joao