diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2014-06-10 11:33:36 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2014-06-12 12:05:46 +0800 |
| commit | ef3cc2def9729f72263c0dd5c5db1345d7fbf0a9 (patch) | |
| tree | d5c9090c07b15b598af986670254c8785b174a67 | |
| parent | bd6119680bae1e8a577a0fc9adef582c9f60df27 (diff) | |
ARM: mm: fix the boundary checking on bitmaps
The issue of boundary checking on bitmaps is introduced by this commit
in below.
commit 4d852ef8c2544ce21ae41414099a7504c61164a0
Author: Andreas Herrmann <andreas.herrmann@calxeda.com>
Date: Tue Feb 25 13:09:53 2014 +0100
arm: dma-mapping: Add support to extend DMA IOMMU mappings
Multiple bitmaps were introduced as extension. If it needs to extend
a bitmap, it still check whether the allocation exceeding the total
size, not current bitmap size. So change the condition from
mapping->bits to PAGE_SIZE.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index f62aa0677e5c..e8d6d29bfdf9 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1087,9 +1087,9 @@ static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping, spin_lock_irqsave(&mapping->lock, flags); for (i = 0; i < mapping->nr_bitmaps; i++) { start = bitmap_find_next_zero_area(mapping->bitmaps[i], - mapping->bits, 0, count, align); + PAGE_SIZE, 0, count, align); - if (start > mapping->bits) + if (start > PAGE_SIZE) continue; bitmap_set(mapping->bitmaps[i], start, count); @@ -1108,9 +1108,9 @@ static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping, } start = bitmap_find_next_zero_area(mapping->bitmaps[i], - mapping->bits, 0, count, align); + PAGE_SIZE, 0, count, align); - if (start > mapping->bits) { + if (start > PAGE_SIZE) { spin_unlock_irqrestore(&mapping->lock, flags); return DMA_ERROR_CODE; } |