Commit 26f98b66 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Luis Henriques

ARM: 8404/1: dma-mapping: fix off-by-one error in bitmap size check

commit 462859aa upstream.

nr_bitmaps member of mapping structure stores the number of already
allocated bitmaps and it is interpreted as loop iterator (it starts from
0 not from 1), so a comparison against number of possible bitmap
extensions should include this fact. This patch fixes this by changing
the extension failure condition. This issue has been introduced by
commit 4d852ef8 ("arm: dma-mapping: Add
support to extend DMA IOMMU mappings").
Reported-by: default avatarHyungwon Hwang <human.hwang@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarHyungwon Hwang <human.hwang@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 84b6f866
...@@ -2013,7 +2013,7 @@ static int extend_iommu_mapping(struct dma_iommu_mapping *mapping) ...@@ -2013,7 +2013,7 @@ static int extend_iommu_mapping(struct dma_iommu_mapping *mapping)
{ {
int next_bitmap; int next_bitmap;
if (mapping->nr_bitmaps > mapping->extensions) if (mapping->nr_bitmaps >= mapping->extensions)
return -EINVAL; return -EINVAL;
next_bitmap = mapping->nr_bitmaps; next_bitmap = mapping->nr_bitmaps;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment