Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f57a872f authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Fix out-of-bounds dereference" into msm-4.8

parents 5f94da82 e7595e5b

drivers/iommu/arm-smmu.c

+3 −1
Original line number Diff line number Diff line
@@ -357,8 +357,10 @@ struct arm_smmu_master_cfg { 
#define INVALID_SMENDX			-1

#define __fwspec_cfg(fw) ((struct arm_smmu_master_cfg *)fw->iommu_priv)

#define fwspec_smmu(fw)  (__fwspec_cfg(fw)->smmu)

#define fwspec_smendx(fw, i) \

	(i >= fw->num_ids ? INVALID_SMENDX : __fwspec_cfg(fw)->smendx[i])

#define for_each_cfg_sme(fw, i, idx) \

	for (i = 0; idx = __fwspec_cfg(fw)->smendx[i], i < fw->num_ids; ++i)

	for (i = 0; idx = fwspec_smendx(fw, i), i < fw->num_ids; ++i)



/*

 * Describes resources required for on/off power operation.