iommu/arm-smmu: Fix out-of-bounds dereference
authorRobin Murphy <robin.murphy@arm.com>
Mon, 7 Nov 2016 18:25:09 +0000 (18:25 +0000)
committerJoerg Roedel <jroedel@suse.de>
Tue, 8 Nov 2016 13:52:41 +0000 (14:52 +0100)
commit8c82d6ec5abcf9691d37f329bf5f42f6868405db
tree2f7cfe5ecec2af776e9514340a4f3e4746ad185a
parent3c117b543528b0d25801bd75444037dd0fcd2b8d
iommu/arm-smmu: Fix out-of-bounds dereference

When we iterate a master's config entries, what we generally care
about is the entry's stream map index, rather than the entry index
itself, so it's nice to have the iterator automatically assign the
former from the latter. Unfortunately, booting with KASAN reveals
the oversight that using a simple comma operator results in the
entry index being dereferenced before being checked for validity,
so we always access one element past the end of the fwspec array.

Flip things around so that the check always happens before the index
may be dereferenced.

Fixes: adfec2e709d2 ("iommu/arm-smmu: Convert to iommu_fwspec")
Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/arm-smmu.c