* [PATCH] swiotlb: avoid potential left shift overflow
@ 2022-08-05 11:44 Chao Gao
2022-08-06 8:26 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Chao Gao @ 2022-08-05 11:44 UTC (permalink / raw)
To: iommu, linux-kernel
Cc: hch, m.szyprowski, robin.murphy, konrad.wilk, jxgao, Chao Gao
The second operand passed to slot_addr() is declared as int or unsigned int
in all call sites. The left-shift to get the offset of a slot can overflow
if swiotlb size is larger than 4G.
Fixes: 26a7e094783d ("swiotlb: refactor swiotlb_tbl_map_single")
Signed-off-by: Chao Gao <chao.gao@intel.com>
---
kernel/dma/swiotlb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index c5a9190b218f..391b03b72978 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -579,7 +579,7 @@ static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size
}
}
-#define slot_addr(start, idx) ((start) + ((idx) << IO_TLB_SHIFT))
+#define slot_addr(start, idx) ((start) + ((phys_addr_t)(idx) << IO_TLB_SHIFT))
/*
* Carefully handle integer overflow which can occur when boundary_mask == ~0UL.
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] swiotlb: avoid potential left shift overflow
2022-08-05 11:44 [PATCH] swiotlb: avoid potential left shift overflow Chao Gao
@ 2022-08-06 8:26 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2022-08-06 8:26 UTC (permalink / raw)
To: Chao Gao
Cc: iommu, linux-kernel, hch, m.szyprowski, robin.murphy, konrad.wilk, jxgao
On Fri, Aug 05, 2022 at 07:44:38PM +0800, Chao Gao wrote:
> The second operand passed to slot_addr() is declared as int or unsigned int
> in all call sites. The left-shift to get the offset of a slot can overflow
> if swiotlb size is larger than 4G.
>
> Fixes: 26a7e094783d ("swiotlb: refactor swiotlb_tbl_map_single")
> Signed-off-by: Chao Gao <chao.gao@intel.com>
Can you just convert it to an inline function? That will take care
of the typing in a much cleaner way than a cast.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-06 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 11:44 [PATCH] swiotlb: avoid potential left shift overflow Chao Gao
2022-08-06 8:26 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).