leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/iommu: Avoid undefined right shift in iommu_range_alloc()

Browse Source 
In iommu_range_alloc() we generate a mask by right shifting ~0,
however if the specified alignment is 0 then we right shift by 64,
which is undefined. UBSAN tells us so:

  UBSAN: Undefined behaviour in ../arch/powerpc/kernel/iommu.c:193:35
  shift exponent 64 is too large for 64-bit type 'long unsigned int'

We can avoid it by instead generating the mask with:

  align_mask = (1ull << align_order) - 1;

That will also generate an undefined shift if align_order is 64 or
greater, but that shouldn't be a problem for a while.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2017-08-08 17:06:32 +10:00
parent 7efbae9089
commit 63b85621d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/iommu.c
View File

@ -190,7 +190,7 @@ static unsigned long iommu_range_alloc(struct device *dev,
unsigned int pool_nr; unsigned int pool_nr;
struct iommu_pool *pool; struct iommu_pool *pool;
align_mask = 0xffffffffffffffffl >> (64 - align_order); align_mask = (1ull << align_order) - 1;
/* This allocator was derived from x86_64's bit string search */ /* This allocator was derived from x86_64's bit string search */