Skip to content

Commit

Permalink
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprows…
Browse files Browse the repository at this point in the history
…ki/linux-dma-mapping

Pull one more DMA-mapping fix from Marek Szyprowski:
 "This patch fixes very subtle bug (typical off-by-one error) which
  might appear in very rare circumstances."

* 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  arm: mm: fix DMA pool affiliation check
  • Loading branch information
torvalds committed Sep 15, 2012
2 parents 1c23ce7 + f3d8752 commit 1568d9f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static bool __in_atomic_pool(void *start, size_t size)
void *pool_start = pool->vaddr;
void *pool_end = pool->vaddr + pool->size;

if (start < pool_start || start > pool_end)
if (start < pool_start || start >= pool_end)
return false;

if (end <= pool_end)
Expand Down

0 comments on commit 1568d9f

Please sign in to comment.