anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "iommu/arm-smmu: Checks added for NULL pointer"

Browse Source
This commit is contained in:
qctecmdr
2024-01-04 00:08:44 -08:00
committed by Gerrit - the friendly Code Review server
parent 4611894bd2 2c7a8e4126
commit 782a0f3106
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iommu/arm/arm-smmu/arm-smmu.c
View File

@@ -453,14 +453,14 @@ static int __arm_smmu_alloc_cb(unsigned long *map, int start, int end,
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev); struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev);
struct arm_smmu_device *smmu = cfg->smmu; struct arm_smmu_device *smmu;
int idx; int idx;
int i; int i;
int cb = -EINVAL; int cb = -EINVAL;
if (!fwspec || !cfg) if (!fwspec || !cfg)
return cb; return cb;
smmu = cfg->smmu;
for_each_cfg_sme(cfg, fwspec, i, idx) { for_each_cfg_sme(cfg, fwspec, i, idx) {
if (smmu->s2crs[idx].pinned) if (smmu->s2crs[idx].pinned)
cb = smmu->s2crs[idx].cbndx; cb = smmu->s2crs[idx].cbndx;