diff options
| author | Chao Gao <chao.gao@intel.com> | 2022-08-19 16:45:37 +0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-09-07 10:38:16 +0200 |
| commit | 3f0461613ebcdc8c4073e235053d06d5aa58750f (patch) | |
| tree | fb2bfd91fbf9fc1b9a55ddbdcce925c17a14a7df /kernel | |
| parent | 2995b8002cefc7b0b00b8f9a0ce36601a8c390c0 (diff) | |
| download | lwn-3f0461613ebcdc8c4073e235053d06d5aa58750f.tar.gz lwn-3f0461613ebcdc8c4073e235053d06d5aa58750f.zip | |
swiotlb: avoid potential left shift overflow
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.
Convert the macro to an inline function and declare the second argument as
phys_addr_t to avoid the potential overflow.
Fixes: 26a7e094783d ("swiotlb: refactor swiotlb_tbl_map_single")
Signed-off-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Dongli Zhang <dongli.zhang@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/swiotlb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index dd8863987e0c..1ce8977d911c 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -575,7 +575,10 @@ 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)) +static inline phys_addr_t slot_addr(phys_addr_t start, phys_addr_t idx) +{ + return start + (idx << IO_TLB_SHIFT); +} /* * Carefully handle integer overflow which can occur when boundary_mask == ~0UL. |