iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parisc: fix IOMMU's device boundary overflow bug on 32bits arch

Browse Source 
On 32bits boxes, boundary_size becomes zero due to a overflow and we
hit BUG_ON in iommu_is_span_boundary.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
FUJITA Tomonori 2008-03-05 17:09:30 +09:00 committed by Linus Torvalds
parent 41f7f60d31
commit 4a0d3f3afd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/parisc/ccio-dma.c
View File

@ -366,8 +366,8 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
** ggg sacrifices another 710 to the computer gods. ** ggg sacrifices another 710 to the computer gods.
*/ */
boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1, 1 << IOVP_SHIFT); boundary_size = ALIGN((unsigned long long)dma_get_seg_boundary(dev) + 1,
boundary_size >>= IOVP_SHIFT; 1ULL << IOVP_SHIFT) >> IOVP_SHIFT;
if (pages_needed <= 8) { if (pages_needed <= 8) {
/* /*

4
drivers/parisc/sba_iommu.c
View File

@ -341,8 +341,8 @@ sba_search_bitmap(struct ioc *ioc, struct device *dev,
unsigned long shift; unsigned long shift;
int ret; int ret;
boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1, 1 << IOVP_SHIFT); boundary_size = ALIGN((unsigned long long)dma_get_seg_boundary(dev) + 1,
boundary_size >>= IOVP_SHIFT; 1ULL << IOVP_SHIFT) >> IOVP_SHIFT;
#if defined(ZX1_SUPPORT) #if defined(ZX1_SUPPORT)
BUG_ON(ioc->ibase & ~IOVP_MASK); BUG_ON(ioc->ibase & ~IOVP_MASK);